From b82aeb623bc5e7eecfc2cedcc6906e1ddf45fc75 Mon Sep 17 00:00:00 2001
From: urkerab <urkerab@users.noreply.github.com>
Date: Tue, 24 Dec 2019 16:35:42 +0000
Subject: [PATCH] Gorilla Tactics should only lock into the first successful
 move (#6217)

---
 data/abilities.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/abilities.js b/data/abilities.js
index 8608316fa0..38439975a4 100644
--- a/data/abilities.js
+++ b/data/abilities.js
@@ -1303,7 +1303,7 @@ let BattleAbilities = {
 			}
 		},
 		onModifyMove(move, pokemon) {
-			if (move.isZPowered || move.maxPowered || move.id === 'struggle') return;
+			if (pokemon.abilityData.choiceLock || move.isZPowered || move.maxPowered || move.id === 'struggle') return;
 			pokemon.abilityData.choiceLock = move.id;
 		},
 		onModifyAtkPriority: 1,