From a65720c8d8cf5a58ebd42c4a016a33bbcfcf2b02 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Mon, 13 Aug 2012 13:54:36 -0700
Subject: [PATCH] Make sure hasValidMove is calculated correctly

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

diff --git a/battles.js b/battles.js
index 8240c138f3..16ca2f5ae2 100644
--- a/battles.js
+++ b/battles.js
@@ -423,7 +423,7 @@ function BattlePokemon(set, side) {
 			}
 			if (selfP.disabledMoves[move.id] || !move.pp) {
 				move.disabled = true;
-			} else {
+			} else if (!move.disabled) {
 				hasValidMove = true;
 			}
 			moves.push(move);