Cleanup

ai/control.lua

@@ -225,6 +225,9 @@ function Control.shouldCatch(partySize)
 	if not shouldCatch then
 		return false
 	end
+	if yellow and not Inventory.contains("pokeball") then
+		return false
+	end
 	if not partySize then
 		partySize = Memory.value("player", "party_size")
 	end

ai/red/strategies.lua

@@ -888,8 +888,8 @@ strategyFunctions.potionBeforeMisty = function(data)
 		if data.goldeen then
 			Strategies.setYolo("goldeen")
 			local curr_hp, red_hp = Combat.hp(), Combat.redHP()
-			if Control.yolo or curr_hp < red_hp + 6 then
-				if Pokemon.index(0, "hp") > 7 then
+			if Control.yolo or (not Combat.inRedBar() and curr_hp < red_hp + 6) then
+				if curr_hp > 7 then
 					return true
 				end
 			end

main.lua

@@ -68,9 +68,6 @@ p("Welcome to PokeBot "..GAME_NAME.." version "..VERSION, true)
 Control.init()
 
 STREAMING_MODE = not Walk.init()
-if INTERNAL and STREAMING_MODE then
-	RESET_FOR_TIME = true
-end
 
 if CUSTOM_SEED then
 	client.reboot_core()

util/input.lua

@@ -23,7 +23,7 @@ local function sendButton(button, ab)
 		Utils.drawText(0, 7, button.." "..remainingFrames)
 	end
 	if ab then
-		buttonbutton = "A,B"
+		button = "A,B"
 	end
 	bridgeButton(button)
 	setForFrame = button

util/settings.lua

@@ -1,6 +1,7 @@
 local Settings = {}
 
 local Textbox = require "action.textbox"
+local Strategies = require "ai.strategies"
 
 local Bridge = require "util.bridge"
 local Input = require "util.input"