From 1d6d6a2bdf673c04a87307273d1cd3840485963f Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Mon, 24 Mar 2025 14:59:36 +0100 Subject: [PATCH] Fixes choice move locking at the wrong time (#6467) --- src/battle_script_commands.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 62ae2184ee..eb817f9dfe 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6479,9 +6479,10 @@ static void Cmd_moveend(void) { u16 *choicedMoveAtk = &gBattleStruct->choicedMove[gBattlerAttacker]; if (gHitMarker & HITMARKER_OBEYS - && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker) == ABILITY_GORILLA_TACTICS) + && !(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gChosenMove != MOVE_STRUGGLE - && (*choicedMoveAtk == MOVE_NONE || *choicedMoveAtk == MOVE_UNAVAILABLE)) + && (*choicedMoveAtk == MOVE_NONE || *choicedMoveAtk == MOVE_UNAVAILABLE) + && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker) == ABILITY_GORILLA_TACTICS)) { if ((moveEffect == EFFECT_BATON_PASS || moveEffect == EFFECT_HEALING_WISH) && !(gBattleStruct->moveResultFlags[gBattlerTarget] & MOVE_RESULT_FAILED))