From 550261b8316c54538f45e380b7190c90bc5c9a9e Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Thu, 25 Aug 2011 01:22:03 +0000
Subject: [PATCH] Hex Editor - Fix Endian display on 2 & 4 byte view, fix
 freezing of multibyte values, fix adding to ram watch of multibyte values,
 fix ram watch to run UpdateValues when an external dialog adds a value

---
 BizHawk.MultiClient/tools/HexEditor.cs | 41 ++++++++++++++++++++------
 BizHawk.MultiClient/tools/RamWatch.cs  |  1 +
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 9b121cbfc9..e092d4d2b3 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -168,9 +168,9 @@ namespace BizHawk.MultiClient
 			unchecked
 			{
 				if (endian)
-					return Domain.PeekByte(addr) + (Domain.PeekByte(addr + 1) * 256);
-				else
 					return (Domain.PeekByte(addr) * 256) + Domain.PeekByte(addr + 1);
+				else
+					return Domain.PeekByte(addr) + (Domain.PeekByte(addr + 1) * 256);
 			}
 		}
 
@@ -429,6 +429,8 @@ namespace BizHawk.MultiClient
 			{
 				Watch w = new Watch();
 				w.address = address;
+				w.bigendian = Global.Config.HexEditorBigEndian;
+				w.signed = asigned.HEX;
 
 				switch (Global.Config.HexEditorDataSize)
 				{
@@ -444,9 +446,6 @@ namespace BizHawk.MultiClient
 						break;
 				}
 
-				w.bigendian = Global.Config.HexEditorBigEndian;
-				w.signed = asigned.HEX;
-
 				Global.MainForm.LoadRamWatch();
 				Global.MainForm.RamWatch1.AddWatch(w);
 			}
@@ -561,21 +560,45 @@ namespace BizHawk.MultiClient
 			{
 				Cheat c = new Cheat();
 				c.address = address;
-				c.value = Domain.PeekByte(addressOver);
+				c.value = Domain.PeekByte(address);
 				c.domain = Domain;
-				//TODO: multibyte
+				c.Enable();
+				Global.MainForm.Cheats1.AddCheat(c);
+
 				switch (Global.Config.HexEditorDataSize)
 				{
 					default:
 					case 1:
 						break;
 					case 2:
+						Cheat c2 = new Cheat();
+						c2.address = address + 1;
+						c2.domain = Domain;
+						c2.value = Domain.PeekByte(address + 1);
+						c2.Enable();
+						Global.MainForm.Cheats1.AddCheat(c2);
 						break;
 					case 4:
+						Cheat c42 = new Cheat();
+						c42.address = address + 1;
+						c42.domain = Domain;
+						c42.value = Domain.PeekByte(address + 1);
+						c42.Enable();
+						Global.MainForm.Cheats1.AddCheat(c42);
+						Cheat c43 = new Cheat();
+						c43.address = address + 2;
+						c43.domain = Domain;
+						c43.value = Domain.PeekByte(address + 2);
+						c43.Enable();
+						Global.MainForm.Cheats1.AddCheat(c43);
+						Cheat c44 = new Cheat();
+						c44.address = address + 3;
+						c44.domain = Domain;
+						c44.value = Domain.PeekByte(address + 3);
+						c44.Enable();
+						Global.MainForm.Cheats1.AddCheat(c44);
 						break;
 				}
-
-				Global.MainForm.Cheats1.AddCheat(c);
 			}
 		}
 
diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs
index d5632176d0..e3824a6ec5 100644
--- a/BizHawk.MultiClient/tools/RamWatch.cs
+++ b/BizHawk.MultiClient/tools/RamWatch.cs
@@ -80,6 +80,7 @@ namespace BizHawk.MultiClient
 		{
 			watchList.Add(w);
 			DisplayWatchList();
+			UpdateValues();
 		}
 
 		private void LoadConfigSettings()