Use table for teaching moves to alternate pokemon

ai/strategies.lua

@@ -658,7 +658,7 @@ Strategies.functions = {
 			else
 				replacement = 0
 			end
-			if Inventory.teach(itemName, data.poke, replacement, data.alt) then
+			if Inventory.teach(itemName, data.poke, replacement) then
 				status.menuOpened = true
 			else
 				Menu.pause()

data/red/paths.lua

@@ -158,7 +158,7 @@ local Paths = {
 	-- Departure
 	{94, {14,2}, {s="epicCutscene"}},
 	-- To Surge
-	{5, {18,29}, {18,26}, {30,26}, {30,14}, {15,14}, {15,17}, {s="potionBeforeSurge"}, {s="swap",item="repel",dest=0,chain=true}, {s="teach",move="cut",poke="oddish",alt="paras",chain=true}, {s="teach",move="dig",poke="paras",alt="squirtle",chain=true}, {s="skill",move="cut",done=0x0D4D}, {15,20}, {12,20}, {12,19}},
+	{5, {18,29}, {18,26}, {30,26}, {30,14}, {15,14}, {15,17}, {s="potionBeforeSurge"}, {s="swap",item="repel",dest=0,chain=true}, {s="teach",move="cut",poke={"oddish","paras"},chain=true}, {s="teach",move="dig",poke={"paras","squirtle"},chain=true}, {s="skill",move="cut",done=0x0D4D}, {15,20}, {12,20}, {12,19}},
 	-- Trashcans
 	{92, {4,17}, {c="a",a="Surge's Gym"}, {4,16}, {2,16}, {2,11}, {s="trashcans"}, {4,6}, {4,3}, {5,3}, {5,2}, {s="talk",dir="Up"}, {s="fightSurge"}, {s="split"}, {s="tweetSurge"}, {4,2}, {4,13}, {5,13}, {5,18}},
 
@@ -236,7 +236,7 @@ local Paths = {
 -- 9: FLY
 
 	-- Fly to Lavender
-	{27, {7,6}, {s="swap",item="super_repel",dest=1,chain=true}, {s="potion",hp=10,chain=true}, {s="teach",move="horn_drill",replace="bubblebeam",chain=true}, {s="item",item="super_repel",chain=true}, {s="swap",item="x_accuracy",dest=2,chain=true}, {s="teach",move="fly",poke="spearow",alt="pidgey",chain=true}, {s="teach",move="rock_slide",replace="poison_sting",chain=true}, {s="fly",dest="lavender",map=4}},
+	{27, {7,6}, {s="swap",item="super_repel",dest=1,chain=true}, {s="potion",hp=10,chain=true}, {s="teach",move="horn_drill",replace="bubblebeam",chain=true}, {s="item",item="super_repel",chain=true}, {s="swap",item="x_accuracy",dest=2,chain=true}, {s="teach",move="fly",poke={"spearow","pidgey"},chain=true}, {s="teach",move="rock_slide",replace="poison_sting",chain=true}, {s="fly",dest="lavender",map=4}},
 	-- To the tower
 	{4, {3,6}, {c="a",a="Pokemon Tower"}, {14,6}, {14,5}},
 	-- Pokemon Tower

storage/inventory.lua

@@ -92,7 +92,7 @@ end
 
 -- Actions
 
-function Inventory.teach(item, poke, replaceIdx, altPoke)
+function Inventory.teach(item, poke, replaceIdx)
 	local main = Memory.value("menu", "main")
 	local column = Menu.getCol()
 	if main == 144 then
@@ -121,7 +121,11 @@ function Inventory.teach(item, poke, replaceIdx, altPoke)
 		else
 			local teachIndex = 0
 			if poke then
-				teachIndex = Pokemon.indexOf(poke, altPoke)
+				if type(poke) == "table" then
+					teachIndex = Pokemon.indexOf(unpack(poke))
+				else
+					teachIndex = Pokemon.indexOf(poke)
+				end
 			end
 			Pokemon.select(teachIndex)
 		end

storage/pokemon.lua

@@ -144,7 +144,7 @@ local function fieldMoveIndex(move)
 				moveIndex = 1
 			end
 		elseif move == "dig" then
-			if Pokemon.inParty("sandshrew") then
+			if not Pokemon.inParty("charmander") then
 				moveIndex = 1
 			end
 		elseif move == "surf" then