Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PP being checked when HITMARKER_NO_PPDEDUCT is set

Browse Source 
This fixes multi target moves and seems like it should be done anyway,
This commit is contained in:
BuffelSaft 2021-10-16 17:31:27 +13:00
parent b5293cc3e2
commit 791f4164a2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_script_commands.c
View File

@ -1392,7 +1392,8 @@ static void Cmd_attackcanceler(void)
return; return;
if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0)) if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0))
return; return;
if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING)) if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE
&& !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT))
&& !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
{ {
gBattlescriptCurrInstr = BattleScript_NoPPForMove; gBattlescriptCurrInstr = BattleScript_NoPPForMove;