From d5fe2240b84153cdbeb0ab8f07ecdd88c1614264 Mon Sep 17 00:00:00 2001 From: ghoulslash Date: Sun, 8 May 2022 21:07:44 -0400 Subject: [PATCH] fix IsAbilityPreventingEscape message in party menu --- src/battle_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index f260e5aaf..2a7875924 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4028,8 +4028,8 @@ static void HandleTurnActionSelectionState(void) { BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_CANT_SWITCH, PARTY_SIZE, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); } - else if ((i = IsAbilityPreventingEscape(gActiveBattler) - && ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item) != HOLD_EFFECT_SHED_SHELL)) + else if (ItemId_GetHoldEffect(gBattleMons[gActiveBattler].item) != HOLD_EFFECT_SHED_SHELL + && (i = IsAbilityPreventingEscape(gActiveBattler))) // must be last to keep i value integrity { BtlController_EmitChoosePokemon(BUFFER_A, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, PARTY_SIZE, gBattleMons[i - 1].ability, gBattleStruct->battlerPartyOrders[gActiveBattler]); }