diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-10 13:56:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 13:56:25 -0400 |
| commit | 6133c6b0af67e2c6a3e2a2c82bef58d2750b354f (patch) | |
| tree | fefd76d067640598e2c1ada81e84f9e3536f8cad /src/battle_script_commands.c | |
| parent | 7d656457567d0f33bd5ee781d0a19676f052aa75 (diff) | |
| parent | f45336c546373b908ea5c42dae1dbad80fad8d83 (diff) | |
Merge pull request #1006 from AsparagusEduardo/UsingBattleAction
Using Battle Action constants
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; |