diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 41b473c5af..cdcb02d28f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3800,7 +3800,12 @@ void SetMoveEffect(bool32 primary, bool32 certain) } break; case MOVE_EFFECT_BUG_BITE: - if (GetItemPocket(gBattleMons[gEffectBattler].item) == POCKET_BERRIES + if (GetBattlerHoldEffect(gEffectBattler, TRUE) == HOLD_EFFECT_JABOCA_BERRY) + { + // jaboca berry triggers instead of being stolen + gBattlescriptCurrInstr++; + } + else if (GetItemPocket(gBattleMons[gEffectBattler].item) == POCKET_BERRIES && battlerAbility != ABILITY_STICKY_HOLD) { // target loses their berry diff --git a/test/battle/hold_effect/jaboca_berry.c b/test/battle/hold_effect/jaboca_berry.c index 29658c7fe1..a23cd90bb9 100644 --- a/test/battle/hold_effect/jaboca_berry.c +++ b/test/battle/hold_effect/jaboca_berry.c @@ -42,7 +42,6 @@ SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP i SINGLE_BATTLE_TEST("Jaboca Berry triggers before Bug Bite can steal it") { - KNOWN_FAILING; GIVEN { ASSUME(GetMoveCategory(MOVE_BUG_BITE) == DAMAGE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT);