atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parental Bond/Bug Bite interaction

Browse source 
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).
This commit is contained in:
BuffelSaft 2021-10-15 17:07:02 +13:00
parent e59be67023
commit 8db2e725d5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/battle_script_commands.c
View file

@ -3373,7 +3373,8 @@ void SetMoveEffect(bool32 primary, u32 certain)
break; break;
case MOVE_EFFECT_BUG_BITE: case MOVE_EFFECT_BUG_BITE:
if (ItemId_GetPocket(gBattleMons[gEffectBattler].item) == POCKET_BERRIES 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 // target loses their berry
gLastUsedItem = gBattleMons[gEffectBattler].item; gLastUsedItem = gBattleMons[gEffectBattler].item;