diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-30 17:17:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-30 17:17:20 -0600 |
| commit | 8e24a49b780294284ff48d2c9add60ac058a6800 (patch) | |
| tree | fdc14c430d83e71cd5829f4f1abfda6af5c29463 /src/battle_script_commands.c | |
| parent | 9dd7f8f2147ffcaa0b5a347a937b269a946717b3 (diff) | |
| parent | 0ad4795e69812d9c1e938922eee34b4d9208bf5d (diff) | |
Merge pull request #413 from DizzyEggg/do
Match 2 field effect functions
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 5bd7de072..6a7ca1725 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -942,7 +942,7 @@ static void atk00_attackcanceler(void) return; if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0)) return; - if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & 0x800200) + if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING)) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) { gBattlescriptCurrInstr = BattleScript_NoPPForMove; |