From 6aafb95ec586af851f4ee205fadb804e941bcf80 Mon Sep 17 00:00:00 2001
From: The Immortal <the_immortal123@live.com>
Date: Sun, 16 Feb 2014 22:55:27 +0400
Subject: [PATCH] Revert "edit frustration curSet.happiness"

This reverts commit b2cf7a59f966b8353a666195015940951881331a.
---
 js/client-teambuilder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index c733fbde2..c08a3a1c5 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -1233,7 +1233,7 @@
 			} else if (move === 'Return') {
 				this.curSet.happiness = 255;
 			} else if (move === 'Frustration') {
-				this.curSet.happiness = 1;
+				this.curSet.happiness = 0;
 			}
 		},
 		setPokemon: function(val, selectNext) {