From 382cd41d12c22ef7e4ea1dfddb0be5263f0b0ac0 Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Thu, 5 May 2022 22:49:46 -0700 Subject: [PATCH] realized hold effect is defined already --- src/battle_main.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index 3edbea48b..4adca1987 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4020,18 +4020,11 @@ static void HandleTurnActionSelectionState(void) { BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_CANT_SWITCH, PARTY_SIZE, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); } - #ifdef ITEM_EXPANSION else if ((i = IsAbilityPreventingEscape(gActiveBattler) && ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item) != HOLD_EFFECT_SHED_SHELL)) { BtlController_EmitChoosePokemon(BUFFER_A, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, PARTY_SIZE, gBattleMons[i - 1].ability, gBattleStruct->battlerPartyOrders[gActiveBattler]); } - #else - else if ((i = IsAbilityPreventingEscape(gActiveBattler))) - { - BtlController_EmitChoosePokemon(BUFFER_A, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, PARTY_SIZE, gBattleMons[i - 1].ability, gBattleStruct->battlerPartyOrders[gActiveBattler]); - } - #endif else { if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH)