From 512ab98bfe27da2d7f3f4487c978f096f69f031b Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 4 Feb 2024 16:13:27 +0100
Subject: [PATCH] Fix disobedience not resetting multihit moves (#4133)

---
 src/battle_util.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/battle_util.c b/src/battle_util.c
index 167d5bf599..856289d1f1 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -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;