From c212426271479f7341e2a2b00a1cc35010aad833 Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Wed, 12 Apr 2017 21:00:57 -0400
Subject: [PATCH] Teambuilder: List Sketched moves after standard learnsets

---
 js/search.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/js/search.js b/js/search.js
index c6e68dd7f..94d4e4e0c 100644
--- a/js/search.js
+++ b/js/search.js
@@ -883,6 +883,7 @@
 				template = Tools.getTemplate(template.baseSpecies);
 			}
 			var moves = [];
+			var sMoves = [];
 			var sketch = false;
 			var gen = '' + this.gen;
 			while (true) {
@@ -912,9 +913,8 @@
 				}
 			}
 			if (sketch) {
-				moves = [];
 				for (var i in BattleMovedex) {
-					if (i === 'chatter' || i === 'magikarpsrevenge' || i === 'paleowave' || i === 'shadowstrike') continue;
+					if (i === 'chatter' || i === 'magikarpsrevenge' || (format.substr(0, 3) !== 'cap' && (i === 'paleowave' || i === 'shadowstrike'))) continue;
 					if (!BattleMovedex[i].gen) {
 						if (BattleMovedex[i].num >= 622) {
 							BattleMovedex[i].gen = 7;
@@ -936,14 +936,16 @@
 					}
 					if (BattleMovedex[i].gen > this.gen) continue;
 					if (BattleMovedex[i].isZ) continue;
-					moves.push(i);
+					sMoves.push(i);
 				}
 			}
 
 			moves.sort();
+			sMoves.sort();
 
 			var usableMoves = [];
 			var uselessMoves = [];
+			var sketchedMoves = [];
 			for (var i = 0; i < moves.length; i++) {
 				var id = moves[i];
 				var isViable = BattleMovedex[id] && BattleMovedex[id].isViable;
@@ -973,7 +975,12 @@
 					uselessMoves.push(['move', id]);
 				}
 			}
-			this.defaultResultSet = usableMoves.concat(uselessMoves);
+			for (var i = 0; i < sMoves.length; i++) {
+				var id = sMoves[i];
+				if (!sketchedMoves.length) sketchedMoves.push(['header', "Sketched moves"]);
+				sketchedMoves.push(['move', id]);
+			}
+			this.defaultResultSet = usableMoves.concat(uselessMoves).concat(sketchedMoves);
 			break;
 		}