diff --git a/data/movelist.lua b/data/movelist.lua
index 1e45323..1187bc7 100644
--- a/data/movelist.lua
+++ b/data/movelist.lua
@@ -575,7 +575,7 @@ local moves = {
 		name = 'Hyper-Beam',
 		id = 63,
 		move_type = 'normal',
-		special = true,
+		special = false,
 		power = 150,
 		max_pp = 5,
 		accuracy = 90,
diff --git a/data/opponents.lua b/data/opponents.lua
index 3b95e38..f5bf856 100644
--- a/data/opponents.lua
+++ b/data/opponents.lua
@@ -220,6 +220,32 @@ local Opponents = {
 		}
 	},
 
+-- YELLOW
+
+	GarySandslash = {
+		type1 = "ground",
+		type2 = "ground",
+		def = 148,
+		id = 97,
+		spec = 81,
+		hp = 172,
+		speed = 94,
+		level = 61,
+		att = 137,
+		moves = {
+			{
+				max_pp = 10,
+				accuracy = 100,
+				name = "Earthquake",
+				power = 100,
+				id = 89,
+				special = false,
+				pp = 6,
+				move_type = "ground",
+			}
+		}
+	},
+
 }
 
 return Opponents
diff --git a/storage/pokemon.lua b/storage/pokemon.lua
index 845b7ea..3e2636e 100644
--- a/storage/pokemon.lua
+++ b/storage/pokemon.lua
@@ -140,7 +140,13 @@ local function fieldMoveIndex(move)
 	local menuSize = Memory.value("menu", "size")
 	if yellow then
 		if move == "cut" then
-			moveIndex = 1
+			if Pokemon.inParty("charmander") then
+				moveIndex = 1
+			end
+		elseif move == "dig" then
+			if Pokemon.inParty("sandshrew") then
+				moveIndex = 1
+			end
 		elseif move == "surf" then
 			moveIndex = 1
 		end