atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix magic coat

Browse source
This commit is contained in:
AlexOn1ine 2024-12-03 00:04:57 +01:00
parent 8acb31339d
commit c0f5285f21
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/battle_script_commands.c
View file

@ -1309,6 +1309,7 @@ static void Cmd_attackcanceler(void)
gBattleStruct->bouncedMoveIsUsed = TRUE; gBattleStruct->bouncedMoveIsUsed = TRUE;
// Edge case for bouncing a powder move against a grass type pokemon. // Edge case for bouncing a powder move against a grass type pokemon.
ClearDamageCalcResults();
SetAtkCancellerForCalledMove(); SetAtkCancellerForCalledMove();
if (BlocksPrankster(gCurrentMove, gBattlerTarget, gBattlerAttacker, TRUE)) if (BlocksPrankster(gCurrentMove, gBattlerTarget, gBattlerAttacker, TRUE))
{ {
@ -1755,7 +1756,10 @@ static void AccuracyCheck(bool32 recalcDragonDarts, const u8 *nextInstr, const u
if (gBattleStruct->moveResultFlags[gBattlerTarget] & MOVE_RESULT_MISSED) if (gBattleStruct->moveResultFlags[gBattlerTarget] & MOVE_RESULT_MISSED)
gBattleStruct->moveResultFlags[gBattlerTarget] = MOVE_RESULT_MISSED; gBattleStruct->moveResultFlags[gBattlerTarget] = MOVE_RESULT_MISSED;
gBattleStruct->calculatedSpreadMoveAccuracy = TRUE;
if (calcSpreadMove)
gBattleStruct->calculatedSpreadMoveAccuracy = TRUE;
JumpIfMoveFailed(7, move); JumpIfMoveFailed(7, move);
} }
} }