From 2ac765b000c8dd12c6d6ea1a217aec7ef507da6d Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Fri, 24 Jun 2022 20:10:21 -0700
Subject: [PATCH] small adjustments to melon tracer

---
 .../Consoles/Nintendo/NDS/MelonDS.ISettable.cs                | 2 +-
 .../Consoles/Nintendo/NDS/MelonDS.ITraceable.cs               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs
index 367c8ab4ed..c62133970e 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs
@@ -88,7 +88,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 
 			[DisplayName("Trace ARM9 Thumb")]
 			[Description("")]
-			[DefaultValue(false)]
+			[DefaultValue(true)]
 			public bool TraceArm9Thumb { get; set; }
 
 			[DisplayName("Trace ARM9 ARM")]
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs
index 0db1a76193..ebd70a6097 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs
@@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 		private unsafe void MakeTrace(LibMelonDS.TraceMask type, IntPtr r, IntPtr disasm, uint cyclesOff)
 		{
 			string cpu = type switch
-			{	
+			{
 				LibMelonDS.TraceMask.ARM7_THUMB => "ARM7 (Thumb)",
 				LibMelonDS.TraceMask.ARM7_ARM => "ARM7",
 				LibMelonDS.TraceMask.ARM9_THUMB => "ARM9 (Thumb)",
@@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 			uint pc = regs[15] - (isthumb ? 2u : 4u); // handle prefetch
 
 			Tracer.Put(new(
-				disassembly: string.Format("{0:x8}", pc).PadRight(12) + Marshal.PtrToStringAnsi(disasm).PadRight(64),
+				disassembly: string.Format("{0:x8}", pc).PadRight(12) + Marshal.PtrToStringAnsi(disasm).PadRight(36),
 				registerInfo: string.Format(
 					"r0:{0:x8} r1:{1:x8} r2:{2:x8} r3:{3:x8} r4:{4:x8} r5:{5:x8} r6:{6:x8} r7:{7:x8} r8:{8:x8} r9:{9:x8} r10:{10:x8} r11:{11:x8} r12:{12:x8} r13:{13:x8} r14:{14:x8} r15:{15:x8} Cy:{16} {17}",
 					regs[0],