From 745e42a753e0190ed36d4461e5ded21d1c13ff86 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Sat, 21 Oct 2017 09:52:07 -0400
Subject: [PATCH] Hex Editor: Fix Cheat display

Fixes #1026
---
 .../tools/HexEditor/HexEditor.cs               | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 02752e22b6..049dd1057b 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -526,7 +526,21 @@ namespace BizHawk.Client.EmuHawk
 				{
 					if (_addr + j + DataSize <= _domain.Size)
 					{
-						rowStr.AppendFormat(_digitFormatString, MakeValue(_addr + j));
+						int t_val = 0;
+						int t_next = 0;
+
+						for (int k = 0; k < DataSize; k++)
+						{
+							t_next = MakeValue(1, _addr + j + k);
+							t_val += (t_next << ((DataSize - k - 1) * 8));
+
+							if (_addr + j + k == 0x0020 || _addr + j + k == 0x0021)
+							{
+								Console.WriteLine(t_next);
+							}
+						}
+
+						rowStr.AppendFormat(_digitFormatString, t_val);// MakeValue(_addr + j));
 					}
 					else
 					{
@@ -569,7 +583,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (Global.CheatList.IsActive(_domain, address))
 			{
-				return Global.CheatList.GetCheatValue(_domain, address, (WatchSize)DataSize ).Value;
+				return Global.CheatList.GetCheatValue(_domain, address, (WatchSize)dataSize ).Value;
 			}
 
 			switch (dataSize)