From 2282c4fb5c687267a8f10ae727327bd706da3f77 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Sun, 31 Oct 2021 12:09:40 +1300 Subject: [PATCH] Fix MOVEEND_CHOICE_MOVE Oops --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b2dcb39584..ab1e2b531e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4942,7 +4942,7 @@ static void Cmd_moveend(void) break; case MOVEEND_CHOICE_MOVE: // update choice band move if (gHitMarker & HITMARKER_OBEYS - && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker)) + && (HOLD_EFFECT_CHOICE(holdEffectAtk) || GetBattlerAbility(gBattlerAttacker) == ABILITY_GORILLA_TACTICS) && gChosenMove != MOVE_STRUGGLE && (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF)) {