From 4c5bbdc40c78daceca074a3bfcdf989bad7fa65f Mon Sep 17 00:00:00 2001
From: The Immortal <the_immortal123@live.com>
Date: Thu, 20 Aug 2015 21:59:58 +0400
Subject: [PATCH] Random Battle: Fix Sleep Talk without Rest

---
 data/scripts.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/data/scripts.js b/data/scripts.js
index f0c1296e8b..c7f7983a69 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -1181,6 +1181,9 @@ exports.BattleScripts = {
 				case 'perishsong':
 					if (!hasMove['protect']) rejected = true;
 					break;
+				case 'rest':
+					if (!hasMove['sleeptalk'] && movePool.indexOf('sleeptalk') >= 0) rejected = true;
+					break;
 				case 'sleeptalk':
 					if (!hasMove['rest']) rejected = true;
 					break;
@@ -1414,12 +1417,8 @@ exports.BattleScripts = {
 				case 'willowisp':
 					if (hasMove['lavaplume'] || hasMove['sacredfire'] || hasMove['scald'] || hasMove['spore']) rejected = true;
 					break;
-				case 'rest':
-					if (!hasMove['sleeptalk'] && movePool.indexOf('sleeptalk') >= 0) rejected = true;
-					if (hasMove['moonlight'] || hasMove['painsplit'] || hasMove['recover'] || hasMove['synthesis']) rejected = true;
-					break;
-				case 'roost': case 'softboiled': case 'synthesis':
-					if (hasMove['wish']) rejected = true;
+				case 'moonlight': case 'painsplit': case 'recover': case 'roost': case 'softboiled': case 'synthesis':
+					if (hasMove['rest'] || hasMove['wish']) rejected = true;
 					break;
 				case 'roar':
 					if (hasMove['dragontail']) rejected = true;