From 0b5a61dcd3b558659b70088fa467867688cd4398 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Tue, 5 Mar 2019 19:37:59 +1000
Subject: [PATCH] Rewrite "d" replacement again but more like the previous
 algorithm

---
 BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs b/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
index 89fe556df5..aef7dc8ec5 100644
--- a/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
+++ b/BizHawk.Emulation.Cores/CPUs/Z80A/NewDisassembler.cs
@@ -17,7 +17,11 @@ namespace BizHawk.Emulation.Cores.Components.Z80A
 			if (format.IndexOf("n") != -1) format = format.Replace("n", $"{read(addr++):X2}h");
 
 			if (format.IndexOf("+d") != -1) format = format.Replace("+d", "d");
-			if (format.IndexOf("d") != -1) format = format.Replace("d", $"{(sbyte)read(addr++):+X2;-X2}h");
+			if (format.IndexOf("d") != -1)
+			{
+				var b = unchecked ((sbyte) read(addr++));
+				format = format.Replace("d", $"{(b < 0 ? '-' : '+')}{(b < 0 ? -b : b):X2}h");
+			}
 
 			return format;
 		}