ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

loaded dice fix

Browse Source
This commit is contained in:
ghoulslash 2023-01-23 09:36:17 -05:00
parent f97ec1975a
commit 125e73dd07
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/battle_util.c
View File

@ -3813,9 +3813,6 @@ u8 AtkCanceller_UnableToUseMove(void)
SetRandomMultiHitCounter(); SetRandomMultiHitCounter();
} }
if (gMultiHitCounter < 4 && GetBattlerHoldEffect(gBattlerAttacker, TRUE) == HOLD_EFFECT_LOADED_DICE)
gMultiHitCounter = 4;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
} }
else if (gBattleMoves[gCurrentMove].flags & FLAG_TWO_STRIKES) else if (gBattleMoves[gCurrentMove].flags & FLAG_TWO_STRIKES)
@ -10886,4 +10883,10 @@ static void SetRandomMultiHitCounter()
else else
gMultiHitCounter += 2; gMultiHitCounter += 2;
#endif #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;
}
} }