From 00fc09909754d65e098113f20e0e1699e97cbfec Mon Sep 17 00:00:00 2001
From: Kyle Coburn <kylecoburn@gmail.com>
Date: Sat, 18 Apr 2015 21:07:00 -0700
Subject: [PATCH] Cleanup

---
 ai/strategies.lua        |  2 ++
 ai/yellow/strategies.lua | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ai/strategies.lua b/ai/strategies.lua
index f66dc58..f707f9f 100644
--- a/ai/strategies.lua
+++ b/ai/strategies.lua
@@ -1462,6 +1462,7 @@ Strategies.functions = {
 			if Strategies.closeMenuFor({close=true}) then
 				return true
 			end
+			return false
 		end
 		if Inventory.contains("carbos") then
 			return strategyFunctions.item({item="carbos",poke="nidoking",close=true})
@@ -1710,6 +1711,7 @@ function Strategies.softReset()
 	stats = {}
 	Strategies.stats = stats
 	Strategies.updates = {}
+	Strategies.disableThrash = false
 
 	splitNumber, splitTime = 0, 0
 	resetting = nil
diff --git a/ai/yellow/strategies.lua b/ai/yellow/strategies.lua
index 86d0a88..d3e0d11 100644
--- a/ai/yellow/strategies.lua
+++ b/ai/yellow/strategies.lua
@@ -22,7 +22,8 @@ local status = Strategies.status
 local stats = Strategies.stats
 
 local strategyFunctions = Strategies.functions
-Strategies.flareon = true
+
+Strategies.vaporeon = false
 
 -- TIME CONSTRAINTS
 
@@ -193,6 +194,9 @@ local function takeCenter(pp, startMap, entranceX, entranceY, finishX)
 	local px, py = Player.position()
 	local currentMap = Memory.value("game", "map")
 	local sufficientPP = Pokemon.pp(0, "horn_attack") > pp
+	if Strategies.initialize("reported") then
+		print(Pokemon.pp(0, "horn_attack").." / "..pp.." horn attacks")
+	end
 	if currentMap == startMap then
 		if not sufficientPP then
 			if px ~= entranceX then
@@ -249,7 +253,7 @@ end
 -- dodgePalletBoy
 
 strategyFunctions.shopViridianPokeballs = function()
-	return Shop.transaction{
+	return Shop.transaction {
 		buy = {{name="pokeball", index=0, amount=4}, {name="potion", index=1, amount=6}}
 	}
 end
@@ -422,7 +426,7 @@ strategyFunctions.centerMoon = function()
 end
 
 strategyFunctions.centerCerulean = function(data)
-	local ppRequired = 15
+	local ppRequired = 10
 	if data.first then
 		local hasSufficientPP = Pokemon.pp(0, "horn_attack") > ppRequired
 		if Strategies.initialize() then