From 8db2e725d5140cf79696f3c477dc59f388580802 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Fri, 15 Oct 2021 17:07:02 +1300 Subject: [PATCH] Parental Bond/Bug Bite interaction Bug Bite's effect should only occur on the final strike of Parental Bond (which can also be the first strike if it KO's the target). --- src/battle_script_commands.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c7edc283b4..e3f0c59022 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3373,7 +3373,8 @@ void SetMoveEffect(bool32 primary, u32 certain) break; case MOVE_EFFECT_BUG_BITE: if (ItemId_GetPocket(gBattleMons[gEffectBattler].item) == POCKET_BERRIES - && GetBattlerAbility(gEffectBattler) != ABILITY_STICKY_HOLD) + && GetBattlerAbility(gEffectBattler) != ABILITY_STICKY_HOLD + && !(gSpecialStatuses[gBattlerAttacker].parentalBondOn == 2 && gBattleMons[gBattlerTarget].hp != 0)) // Steal berry on final hit { // target loses their berry gLastUsedItem = gBattleMons[gEffectBattler].item;