From 125e73dd07fc1dd8ccfaea6b9608e349b20724e9 Mon Sep 17 00:00:00 2001
From: ghoulslash <pokevoyager0@gmail.com>
Date: Mon, 23 Jan 2023 09:36:17 -0500
Subject: [PATCH] loaded dice fix

---
 src/battle_util.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index 181f3615a6..8adb32b332 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -3813,9 +3813,6 @@ u8 AtkCanceller_UnableToUseMove(void)
                     SetRandomMultiHitCounter();
                 }
                 
-                if (gMultiHitCounter < 4 && GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_LOADED_DICE)
-                    gMultiHitCounter = 4;
-                
                 PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
             }
             else if (gBattleMoves[gCurrentMove].flags & FLAG_TWO_STRIKES)
@@ -10886,4 +10883,10 @@ static void SetRandomMultiHitCounter()
     else
         gMultiHitCounter += 2;
 #endif
+
+    if (gMultiHitCounter < 4 && GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_LOADED_DICE)
+    {
+        // If roll 4 or 5 Loaded Dice doesn't do anything. Otherwise it rolls the number of hits as 5 minus a random integer from 0 to 1 inclusive.
+        gMultiHitCounter = 5 - Random() & 1;
+    }
 }