From 94ffeb2cf8e3214c83d3662598d08b34d50f7312 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Fri, 15 Dec 2023 17:05:11 +0100 Subject: [PATCH] Fix Quick Claw chance (#3737) --- src/battle_main.c | 4 ++-- test/battle/hold_effect/quick_claw.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index 9d9ad4cf44..4e5df86f46 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -5107,7 +5107,7 @@ static void TryChangingTurnOrderEffects(u32 battler1, u32 battler2) gProtectStructs[battler1].quickDraw = TRUE; // Quick Claw and Custap Berry if (!gProtectStructs[battler1].quickDraw - && ((holdEffectBattler1 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, 10)) + && ((holdEffectBattler1 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, GetBattlerHoldEffectParam(battler1))) || (holdEffectBattler1 == HOLD_EFFECT_CUSTAP_BERRY && HasEnoughHpToEatBerry(battler1, 4, gBattleMons[battler1].item)))) gProtectStructs[battler1].usedCustapBerry = TRUE; @@ -5117,7 +5117,7 @@ static void TryChangingTurnOrderEffects(u32 battler1, u32 battler2) gProtectStructs[battler2].quickDraw = TRUE; // Quick Claw and Custap Berry if (!gProtectStructs[battler2].quickDraw - && ((holdEffectBattler2 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, 10)) + && ((holdEffectBattler2 == HOLD_EFFECT_QUICK_CLAW && RandomPercentage(RNG_QUICK_CLAW, GetBattlerHoldEffectParam(battler2))) || (holdEffectBattler2 == HOLD_EFFECT_CUSTAP_BERRY && HasEnoughHpToEatBerry(battler2, 4, gBattleMons[battler2].item)))) gProtectStructs[battler2].usedCustapBerry = TRUE; } diff --git a/test/battle/hold_effect/quick_claw.c b/test/battle/hold_effect/quick_claw.c index 181cac99f2..ded242b65c 100644 --- a/test/battle/hold_effect/quick_claw.c +++ b/test/battle/hold_effect/quick_claw.c @@ -8,7 +8,7 @@ ASSUMPTIONS SINGLE_BATTLE_TEST("Quick Claw activates 10% of the time") { - PASSES_RANDOMLY(1, 10, RNG_QUICK_CLAW); + PASSES_RANDOMLY(2, 10, RNG_QUICK_CLAW); GIVEN { PLAYER(SPECIES_WOBBUFFET) { Speed(1); Item(ITEM_QUICK_CLAW); } OPPONENT(SPECIES_WOBBUFFET) { Speed(100); }