From 6424e35c6a0047494baaca3c746e92bfcd21483b Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Fri, 15 Jan 2021 08:47:09 -0500
Subject: [PATCH] Revert "Replace unnecessary init props w/ ctors, remove hack
 for init props"

This reverts commit af8a3304229f110b72b8aac6b750cdb5b7fc607e.

I like the `init;` feature in modern C# and see it as an improvement on constructor parameters for initializing immutable "data" classes.  Feel free to disagree in code you maintain.
---
 src/BizHawk.Common/IsExternalInit.cs          |  4 +++
 .../Consoles/Nintendo/Gameboy/Gambatte.cs     | 24 ++++++++---------
 .../Consoles/Nintendo/Gameboy/Sameboy.cs      | 26 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 src/BizHawk.Common/IsExternalInit.cs

diff --git a/src/BizHawk.Common/IsExternalInit.cs b/src/BizHawk.Common/IsExternalInit.cs
new file mode 100644
index 0000000000..3618710c91
--- /dev/null
+++ b/src/BizHawk.Common/IsExternalInit.cs
@@ -0,0 +1,4 @@
+namespace System.Runtime.CompilerServices
+{
+	public static class IsExternalInit {}
+}
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
index af382419ee..49747d8c74 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Gambatte.cs
@@ -396,26 +396,24 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
 			{
 				throw new InvalidOperationException("Unexpected error in gambatte_getmemoryarea");
 			}
-			return new GPUMemoryAreas(vram: _vram, oam: _oam, sppal: _sppal, bgpal: _bgpal);
+			return new GPUMemoryAreas
+			{
+				Vram = _vram,
+				Oam = _oam,
+				Sppal = _sppal,
+				Bgpal = _bgpal,	
+			};
 		}
 
 		private class GPUMemoryAreas : IGPUMemoryAreas
 		{
-			public IntPtr Vram { get; }
+			public IntPtr Vram { get; init; }
 
-			public IntPtr Oam { get; }
+			public IntPtr Oam { get; init; }
 
-			public IntPtr Sppal { get; }
+			public IntPtr Sppal { get; init; }
 
-			public IntPtr Bgpal { get; }
-
-			public GPUMemoryAreas(IntPtr vram, IntPtr oam, IntPtr sppal, IntPtr bgpal)
-			{
-				Vram = vram;
-				Oam = oam;
-				Sppal = sppal;
-				Bgpal = bgpal;
-			}
+			public IntPtr Bgpal { get; init; }
 
 			public void Dispose() {}
 		}
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
index fd5ef63c03..59ec6a3b99 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/Sameboy.cs
@@ -312,11 +312,13 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy
 			_exe.Enter();
 			try
 			{
-				return new GPUMemoryAreas(_exe,
-					vram: _cachedGpuPointers[0],
-					oam: _cachedGpuPointers[1],
-					sppal: _cachedGpuPointers[3],
-					bgpal: _cachedGpuPointers[2]);
+				return new GPUMemoryAreas(_exe)
+				{
+					Vram = _cachedGpuPointers[0],
+					Oam = _cachedGpuPointers[1],
+					Sppal = _cachedGpuPointers[3],
+					Bgpal = _cachedGpuPointers[2]
+				};
 			}
 			catch
 			{
@@ -328,21 +330,17 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.Gameboy
 		private class GPUMemoryAreas : IGPUMemoryAreas
 		{
 			private IMonitor _monitor;
-			public IntPtr Vram { get; }
+			public IntPtr Vram { get; init; }
 
-			public IntPtr Oam { get; }
+			public IntPtr Oam { get; init; }
 
-			public IntPtr Sppal { get; }
+			public IntPtr Sppal { get; init; }
 
-			public IntPtr Bgpal { get; }
+			public IntPtr Bgpal { get; init; }
 
-			public GPUMemoryAreas(IMonitor monitor, IntPtr vram, IntPtr oam, IntPtr sppal, IntPtr bgpal)
+			public GPUMemoryAreas(IMonitor monitor)
 			{
 				_monitor = monitor;
-				Vram = vram;
-				Oam = oam;
-				Sppal = sppal;
-				Bgpal = bgpal;
 			}
 
 			public void Dispose()