ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-26 14:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1364 from ghoulslash/two-turn

Browse Source 
Fix Two-Turn Moves Failing Innapropriately
This commit is contained in:
ExpoSeed 2021-04-07 16:12:13 -05:00 committed by GitHub
commit e11fd352fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_script_commands.c
View File

@ -1319,7 +1319,7 @@ static void Cmd_attackcanceler(void)
} }
gHitMarker |= HITMARKER_OBEYS; gHitMarker |= HITMARKER_OBEYS;
if (NoTargetPresent(gCurrentMove)) if (NoTargetPresent(gCurrentMove) && (!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)))
{ {
gBattlescriptCurrInstr = BattleScript_ButItFailedAtkStringPpReduce; gBattlescriptCurrInstr = BattleScript_ButItFailedAtkStringPpReduce;
if (!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) if (!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))