From bc3413a8fa54a4fbed66dbfbcb4c665e079fa539 Mon Sep 17 00:00:00 2001
From: Marty-D <Marty-D@users.noreply.github.com>
Date: Thu, 15 Dec 2016 10:46:38 -0500
Subject: [PATCH] Update non-Instructable moves

---
 data/moves.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/moves.js b/data/moves.js
index aa391facfe..d3870c95de 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -8591,9 +8591,9 @@ exports.BattleMovedex = {
 			if (!target.lastMove) return false;
 			let lastMove = this.getMove(target.lastMove);
 			let noInstruct = {
-				instruct:1, outrage:1, petaldance:1, thrash:1, // TODO: fill this up
+				beakblast:1, copycat:1, focuspunch:1, instruct:1, mefirst:1, metronome:1, mimic:1, mirrormove:1, outrage:1, petaldance:1, shelltrap:1, thrash:1, // TODO: fill this up
 			};
-			if (noInstruct[lastMove.id] || lastMove.isZ || lastMove.flags['charge'] || lastMove.flags['recharge']) {
+			if (noInstruct[lastMove.id] || lastMove.isZ || lastMove.flags['charge'] || lastMove.flags['recharge'] || target.volatiles['beakblast'] || target.volatiles['focuspunch'] || target.volatiles['shelltrap']) {
 				return false;
 			}
 			this.add('-singleturn', target, 'move: Instruct', '[of] ' + source);