From 080ed049f590ced54ead7ae140178bdd2f1f3d41 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Mon, 25 Oct 2021 19:59:29 -0700
Subject: [PATCH] Switch these all around, also let's make this nice in solexp

---
 .../BizHawk.Emulation.Cores.csproj                        | 1 +
 .../Consoles/Nintendo/NDS/LibMelonDS.cs                   | 6 +++---
 .../Consoles/Nintendo/NDS/MelonDS.IDebuggable.cs          | 4 ++--
 .../Consoles/Nintendo/NDS/MelonDS.ISettable.cs            | 4 ++--
 .../Consoles/Nintendo/NDS/MelonDS.ITraceable.cs           | 4 ++--
 .../Consoles/Nintendo/NDS/MelonDS.cs                      | 8 ++++----
 .../Consoles/Nintendo/NDS/NDSDisassembler.cs              | 1 -
 .../Consoles/Nintendo/NDS/NDSFirmware.cs                  | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 4e3b2c1c85..e695c56298 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -57,6 +57,7 @@
 		<Compile Update="Consoles/Nintendo/NES/Boards/SxROM.cs" SubType="Code" />
 		<Compile Update="Consoles/Nintendo/NES/Boards/UxROM.cs" SubType="Code" />
 		<Compile Update="Consoles/Nintendo/NES/NES.*.cs" DependentUpon="NES.cs" />
+		<Compile Update="Consoles/Nintendo/NDS/MelonDS.*.cs" DependentUpon="MelonDS.cs" />
 		<Compile Update="Consoles/Nintendo/SubNESHawk/SubNESHawk.*.cs" DependentUpon="SubNESHawk.cs" />
 		<Compile Update="Consoles/Nintendo/QuickNES/QuickNES.*.cs" DependentUpon="QuickNES.cs" />
 		<Compile Update="Consoles/Nintendo/SNES/LibsnesCore.*.cs" DependentUpon="LibsnesCore.cs" />
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs
index 485df22ff8..fc1a2a0653 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/LibMelonDS.cs
@@ -1,8 +1,8 @@
+using System;
+using System.Runtime.InteropServices;
+
 using BizHawk.BizInvoke;
 using BizHawk.Emulation.Cores.Waterbox;
-using System;
-
-using System.Runtime.InteropServices;
 
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 {
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IDebuggable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IDebuggable.cs
index 7058299a3c..6b3704670f 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IDebuggable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IDebuggable.cs
@@ -1,8 +1,8 @@
-using BizHawk.Emulation.Common;
-
 using System;
 using System.Collections.Generic;
 
+using BizHawk.Emulation.Common;
+
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 {
 	partial class NDS : IDebuggable
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 719aa065ff..3083532507 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs
@@ -1,11 +1,11 @@
 using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
-using Newtonsoft.Json;
-
 using System;
 using System.ComponentModel;
 
+using Newtonsoft.Json;
+
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 {
 	partial class NDS : ISettable<NDS.Settings, NDS.SyncSettings>
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 ded5b4d2d8..ac3ece2f3a 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ITraceable.cs
@@ -1,8 +1,8 @@
-using BizHawk.Emulation.Common;
-
 using System;
 using System.Runtime.InteropServices;
 
+using BizHawk.Emulation.Common;
+
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 {
 	partial class NDS
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
index cd3da45639..e54a16d22d 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
@@ -1,11 +1,11 @@
-using BizHawk.Common;
-using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Cores.Waterbox;
-
 using System;
 using System.Linq;
 using System.Text;
 
+using BizHawk.Common;
+using BizHawk.Emulation.Common;
+using BizHawk.Emulation.Cores.Waterbox;
+
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 {
 	[PortedCore(CoreNames.MelonDS, "Arisotura", "0.9.3", "http://melonds.kuribo64.net/", singleInstance: true, isReleased: false)]
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSDisassembler.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSDisassembler.cs
index 25c2f35307..547e09457c 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSDisassembler.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSDisassembler.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 using BizHawk.BizInvoke;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSFirmware.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSFirmware.cs
index 92417a80d9..a8e492a671 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSFirmware.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/NDSFirmware.cs
@@ -1,9 +1,9 @@
-using BizHawk.Common.BufferExtensions;
-using BizHawk.Emulation.Common;
-
 using System;
 using System.Runtime.InteropServices;
 
+using BizHawk.Common.BufferExtensions;
+using BizHawk.Emulation.Common;
+
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 {
 	// mostly a c++ -> c# port of melon's firmware verification code