Added Megaman X Hitbox viewer lua script.

Fixed Hex Editor's FindNext/FindPrev functions.  FindNext/FindPrev now accept an additional argument (bool) that tells them to wrap around once.  Fixed a bug where if the matched address was the 1st byte of the array it was ignored.

BizHawk.MultiClient/output/Lua/SNES/Megaman X.lua

@@ -0,0 +1,160 @@
+--Author Pasky13
+
+---------------
+----GLOBALS----
+---------------
+local pbase = 0xBA8
+local px = 0xBAD
+local py = 0xBB0
+local cx = 0x7E00B4
+local cy = 0x7E00B6
+
+---------------
+----TOGGLES----
+---------------
+local draw_megaman = true
+local draw_enemies = true
+local draw_hpvalues = true
+local draw_projectiles = true
+--local draw_instantbox = false  -- Bizhawk doesnt support breakpoints
+
+local xm
+local ym
+
+-- Breakpoints not yet implemented in bizhawk
+-- local function draw_instabox(base)
+	
+	-- local camx = mainmemory.read_u16_le(cx)
+	-- local camy = mainmemory.read_u16_le(cy)
+	-- local facing = mainmemory.read_u8(base + 0x11)
+	-- local x = mainmemory.read_u16_le(base + 5) - camx
+	-- local y = mainmemory.read_u16_le(base + 8) - camy
+	-- local boxpointer = mainmemory.read_u16_le(base +0x20) + 0x860000
+	-- local xoff = mainmemory.read_s8(boxpointer + 0)
+	-- local yoff = mainmemory.read_s8(boxpointer + 1)
+	-- local xrad = mainmemory.read_u8(boxpointer + 2)
+	-- local yrad = mainmemory.read_u8(boxpointer + 3)
+	
+	-- if facing > 0x45 then
+		-- xoff = xoff * -1
+	-- end
+	
+	-- gui.drawBox(x + xoff +xrad,y + yoff + yrad, x + xoff - xrad, y + yoff - yrad,0xFFFF0000,0x05FF0000)
+-- end
+
+memory.usememorydomain("CARTROM")
+
+local function megaman()
+
+	local camx = mainmemory.read_u16_le(cx)
+	local camy = mainmemory.read_u16_le(cy)
+	local x = mainmemory.read_u16_le(px) - camx
+	local y = mainmemory.read_u16_le(py) - camy
+	local facing = mainmemory.read_u8(pbase + 0x11)
+	local boxpointer = mainmemory.read_u16_le(pbase + 0x20) + 0x28000
+	local xoff = memory.read_s8(boxpointer + 0)
+	local yoff = memory.read_s8(boxpointer + 1)
+	local xrad = memory.read_u8(boxpointer + 2)
+	local yrad = memory.read_u8(boxpointer + 3)
+	
+	if facing > 0x45 then
+		xoff = xoff * -1
+	end
+	
+	gui.drawBox(x + xoff +xrad,y + yoff + yrad, x + xoff - xrad, y + yoff - yrad,0xFF0000FF,0x400000FF)
+end
+
+local function enemies()
+
+	local x 
+	local xoff
+	local xrad
+	local y
+	local yoff
+	local yrad
+	local camx = mainmemory.read_u16_le(cx)
+	local camy = mainmemory.read_u16_le(cy)
+	local base
+	local boxpointer
+	local facing
+	local fill
+	local outl
+	local start = 0xE68
+	local oend = 32
+	
+	for i = 0, oend,1 do
+	
+		base = start + (i * 0x40)
+		
+		if i == 0 then
+			base = start
+		end
+		
+		if mainmemory.read_u8(base) ~= 0 then
+			
+			if i > 14 and i < 21 then
+				if draw_projectiles == true then
+					fill = 0x40FFFFFF
+					outl = 0xFFFFFFFF
+				else
+					fill = 0x00000000
+					outl = 0x00000000
+				end
+			else
+				fill = 0x40FF0000
+				outl = 0xFFFF0000
+			end	
+			
+			if i > 21 then
+				fill = 0x40FFFF00
+				outl = 0xFFFFFF00
+			end
+			
+			facing = mainmemory.read_u8(base + 0x11)
+			x = mainmemory.read_u16_le(base + 5) - camx
+			y = mainmemory.read_u16_le(base + 8) - camy
+			boxpointer = mainmemory.read_u16_le(base +0x20) + 0x28000
+			xoff = memory.read_s8(boxpointer + 0)
+			yoff = memory.read_s8(boxpointer + 1)
+			xrad = memory.read_u8(boxpointer + 2)
+			yrad = memory.read_u8(boxpointer + 3)
+			
+		
+		if facing > 0x45 then
+				xoff = xoff * -1
+		end
+		
+		--Breakpoints not yet implemented in Bizhawk
+		-- if draw_instantbox == true then
+			-- memory.registerwrite(0x7E0000 + base + 0x20,2,function ()
+				-- draw_instabox(memory.getregister("D"))
+			-- end)
+		-- end
+		
+		--gui.text(x,y,string.format("%X",base))  -- Debug
+		gui.drawBox(x + xoff +xrad,y + yoff + yrad, x + xoff - xrad, y + yoff - yrad,outl, fill)	
+			
+			if draw_hpvalues == true and mainmemory.read_u8(base+0x27) > 0 then
+				if i < 15 or i > 20 then
+					gui.text((x-5) * xm,(y-5) * ym,"HP: " .. mainmemory.read_u8(base+0x27))
+				end
+			end
+		end
+	end
+end
+
+local function scaler()
+	xm = client.screenwidth() / 256
+	ym = client.screenheight() / 224
+end	
+
+while true do
+	scaler()
+	if draw_megaman == true then
+		megaman()
+	end
+	if draw_enemies == true then
+		enemies()
+	end
+	emu.frameadvance()
+end

BizHawk.MultiClient/tools/HexEditor.cs

@@ -1941,9 +1941,9 @@ namespace BizHawk.MultiClient
 			return values;
 		}
 
-		public void FindNext(string value)
+		public void FindNext(string value, Boolean last)
 		{
-			int found = 0;
+			int found = -1;
 
 			string search = value.Replace(" ", "").ToUpper();
 			if (search.Length == 0)
@@ -1980,18 +1980,22 @@ namespace BizHawk.MultiClient
 				}
 			}
 
-			if (found > 0)
+			if (found > -1)
 			{
 				HighlightSecondaries(search, found);
 				GoToAddress(found);
 				FindStr = search;
 				MemoryViewerBox.Focus();
 			}
+			else if (last == false)  // Search the opposite direction if not found
+			{
+				FindPrev(value, true);
+			}
 		}
 
-		public void FindPrev(string value)
+		public void FindPrev(string value, Boolean last)
 		{
-			int found = 0;
+			int found = -1;
 
 			string search = value.Replace(" ", "").ToUpper();
 			if (search.Length == 0)
@@ -2024,13 +2028,17 @@ namespace BizHawk.MultiClient
 				}
 			}
 
-			if (found > 0)
+			if (found > -1)
 			{
 				HighlightSecondaries(search, found);
 				GoToAddress(found);
 				FindStr = search;
 				MemoryViewerBox.Focus();
 			}
+			else if (last == false) // Search the opposite direction if not found
+			{
+				FindPrev(value, true);
+			}
 		}
 
 		private void HighlightSecondaries(string value, int found)
@@ -2221,12 +2229,12 @@ namespace BizHawk.MultiClient
 
 		private void findNextToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			FindNext(FindStr);
+			FindNext(FindStr, false);
 		}
 
 		private void findPrevToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			FindPrev(FindStr);
+			FindPrev(FindStr, false);
 		}
 
 		private void editToolStripMenuItem_DropDownOpened(object sender, EventArgs e)

BizHawk.MultiClient/tools/HexFind.cs

@@ -66,12 +66,12 @@ namespace BizHawk.MultiClient
 
 		private void Find_Prev_Click(object sender, EventArgs e)
 		{
-			Global.MainForm.HexEditor1.FindPrev(GetFindBoxChars());
+			Global.MainForm.HexEditor1.FindPrev(GetFindBoxChars(), false);
 		}
 
 		private void Find_Next_Click(object sender, EventArgs e)
 		{
-			Global.MainForm.HexEditor1.FindNext(GetFindBoxChars());
+			Global.MainForm.HexEditor1.FindNext(GetFindBoxChars(), false);
 		}
 
 		private void ChangeCasing()
@@ -100,7 +100,7 @@ namespace BizHawk.MultiClient
 		{
 			if (e.KeyData == Keys.Enter)
 			{
-				Global.MainForm.HexEditor1.FindNext(GetFindBoxChars());
+				Global.MainForm.HexEditor1.FindNext(GetFindBoxChars(), false);
 			}
 		}
 	}