From 69f58adbb22bde492a0d66593bd93c5a66fbff39 Mon Sep 17 00:00:00 2001
From: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Date: Sun, 26 Mar 2023 15:03:56 -0400
Subject: [PATCH] add check for Gorilla Tactics when resetting choicedMove from
 knock off (#2854)

---
 src/battle_script_commands.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 8b8d4f1e94..f9c117842a 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5304,7 +5304,8 @@ static bool32 TryKnockOffBattleScript(u32 battlerDef)
 
             gLastUsedItem = gBattleMons[battlerDef].item;
             gBattleMons[battlerDef].item = 0;
-            gBattleStruct->choicedMove[battlerDef] = 0;
+            if (gBattleMons[battlerDef].ability != ABILITY_GORILLA_TACTICS)
+                gBattleStruct->choicedMove[battlerDef] = 0;
             gWishFutureKnock.knockedOffMons[side] |= gBitTable[gBattlerPartyIndexes[battlerDef]];
             CheckSetUnburden(battlerDef);