diff options
author | PlatinumMaster <L33TGamer@outlook.com> | 2020-04-15 13:33:06 -0400 |
---|---|---|
committer | PlatinumMaster <L33TGamer@outlook.com> | 2020-04-15 13:33:06 -0400 |
commit | da34eedd9b5c18859a6c68fa28d6250ca1242900 (patch) | |
tree | 7b4e41f4feb633053187152c4c6edf0eb906a3b9 /src/battle_script_commands.c | |
parent | 67b0bec3ffda7d4268a009501aa18292ff5c96fe (diff) | |
parent | 6eefcb1f82dc28cdc626e86fda3a217d21315181 (diff) |
Keep up to date with master.
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r-- | src/battle_script_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 729cce0c9..84f2b1f4d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -8925,7 +8925,7 @@ static void Cmd_jumpifnopursuitswitchdmg(void) for (i = 0; i < gBattlersCount; i++) { if (gBattlerByTurnOrder[i] == gBattlerTarget) - gActionsByTurnOrder[i] = 11; + gActionsByTurnOrder[i] = B_ACTION_TRY_FINISH; } gCurrentMove = MOVE_PURSUIT; @@ -10005,7 +10005,7 @@ static void Cmd_pursuitrelated(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]) - && gChosenActionByBattler[gActiveBattler] == 0 + && gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_MOVE && gChosenMoveByBattler[gActiveBattler] == MOVE_PURSUIT) { gActionsByTurnOrder[gActiveBattler] = 11; |