From caacd8a98d2e21c9072bdaf346448524e2805dcd Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Sat, 1 Aug 2015 00:53:01 -0400
Subject: [PATCH] Don't treat locked moves as called moves

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

diff --git a/js/battle.js b/js/battle.js
index 183086a22..b7898bbe8 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -5608,7 +5608,7 @@ var Battle = (function () {
 			break;
 		case 'move':
 			this.endLastTurn();
-			if (!kwargs.from && this.waitForResult()) return;
+			if ((!kwargs.from || kwargs.from === 'lockedmove') && this.waitForResult()) return;
 			var poke = this.getPokemon(args[1]);
 			var move = Tools.getMove(args[2]);
 			if (this.checkActive(poke)) return;