Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-14 22:18:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix disobedience not resetting multihit moves (#4133)

Browse Source
This commit is contained in:
DizzyEggg
2024-02-04 16:13:27 +01:00
committed by GitHub
parent e75169fb87
commit 512ab98bfe
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_util.c
View File

@@ -3842,6 +3842,10 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType)
gBattleStruct->beatUpSlot = 0;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
}
else
{
gMultiHitCounter = 0;
}
gBattleStruct->atkCancellerTracker++;
break;
case CANCELLER_END:
@@ -8222,6 +8226,7 @@ u8 IsMonDisobedient(void)
} while (gBitTable[gCurrMovePos] & calc);
gCalledMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
SetAtkCancellerForCalledMove();
gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
gBattlerTarget = GetMoveTarget(gCalledMove, NO_TARGET_OVERRIDE);
gHitMarker |= HITMARKER_DISOBEDIENT_MOVE;