From 7cc284cf0b71e7e60d8ef6922475ce5b0f942238 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Sun, 15 May 2022 09:50:12 -0700 Subject: [PATCH] learning GetBattlerHoldEffect is a thing --- src/battle_script_commands.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index aa8b66879..f145025ce 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7082,10 +7082,8 @@ static bool32 TrySymbiosis(u32 battler, u32 itemId) if (!gBattleStruct->itemStolen[gBattlerPartyIndexes[battler]].stolen && gBattleStruct->changedItems[battler] == ITEM_NONE - && ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_BUTTON - && ItemId_GetHoldEffect(itemId) != HOLD_EFFECT_EJECT_PACK - && gBattleStruct->debugHoldEffects[battler] != HOLD_EFFECT_EJECT_BUTTON - && gBattleStruct->debugHoldEffects[battler] != HOLD_EFFECT_EJECT_BUTTON + && GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_EJECT_BUTTON + && GetBattlerHoldEffect(battler, TRUE) != HOLD_EFFECT_EJECT_PACK && !(B_SYMBIOSIS_GEMS >= GEN_7 && gSpecialStatuses[battler].gemBoost) && gCurrentMove != MOVE_FLING //Fling and damage-reducing berries are handled separately. && !gSpecialStatuses[battler].berryReduced