From 4541cc3319454410db2dc5f298546117357960c3 Mon Sep 17 00:00:00 2001
From: CallmeEchoo <samedding@protonmail.com>
Date: Wed, 22 Mar 2023 22:30:24 +0100
Subject: [PATCH] add check for Gorilla Tactics

knock off shouldnt reset choicedMove when the pokemon has the Gorilla Tactics ability
---
 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 126ca06fd1..0038844ac8 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -5330,7 +5330,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);