From 92bbf768afa3846fafe31af2ba0cc1543c3e3ef4 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Thu, 4 Jun 2020 18:34:39 -0400
Subject: [PATCH] GBHawk: Fix HuC3 SRAM

---
 .../Consoles/Nintendo/GBHawk/GBHawk.cs        |  2 +-
 .../Nintendo/GBHawk/Mappers/Mapper_HuC3.cs    | 54 ++++++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
index f4f692eeaf..7f43b859f9 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
@@ -353,7 +353,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				case 0x22: mapper = new MapperMBC7();		mppr = "MBC7";		has_bat = true;		break;
 				case 0xFC: mapper = new MapperCamera();		mppr = "CAM";		has_bat = true;		break;
 				case 0xFD: mapper = new MapperTAMA5();		mppr = "TAMA5";		has_bat = true;		break;
-				case 0xFE: mapper = new MapperHuC3();		mppr = "HuC3";							break;
+				case 0xFE: mapper = new MapperHuC3();		mppr = "HuC3";		has_bat = true;		break;
 				case 0xFF: mapper = new MapperHuC1();		mppr = "HuC1";							break;
 
 				// Bootleg mappers
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
index 4c88df0396..c09bff2fe9 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
@@ -1,6 +1,7 @@
 using BizHawk.Common;
 
 using BizHawk.Emulation.Cores.Components.LR35902;
+using System;
 
 namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 {
@@ -58,38 +59,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 
 		public override byte ReadMemoryHigh(ushort addr)
 		{
-			if ((addr >= 0xA000) && (addr < 0xC000))
+			if ((control >= 0xB) && (control < 0xE))
 			{
-				if ((control >= 0xB) && (control < 0xE))
+				if (control == 0xD)
 				{
-					if (control == 0xD)
-					{
-						return 1;
-					}
-					return chip_read;
+					return 1;
 				}
+				return chip_read;
+			}
 
-				if (RAM_enable)
+			if (Core.cart_RAM != null)
+			{
+				if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
 				{
-					if (Core.cart_RAM != null)
-					{
-						if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
-						{
-							return Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000];
-						}
-						else
-						{
-							return 0xFF;
-						}
-					}
-					else
-					{
-						return 0xFF;
-					}
+					return Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000];
 				}
 				else
-				{
-					// what to return if RAM not enabled and controller not selected?
+				{	
 					return 0xFF;
 				}
 			}
@@ -170,8 +156,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 			}
 			else
 			{
-				if (RAM_enable && ((control < 0xB) || (control > 0xE)))
+				if ((control < 0xB) || (control > 0xE))
 				{
+					if (!RAM_enable)
+					{
+						return;
+					}
+
 					if (Core.cart_RAM != null)
 					{
 						if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
@@ -179,6 +170,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000] = value;
 						}
 					}
+
+					return;
 				}
 				
 				if (control == 0xB)
@@ -243,6 +236,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 				{
 					// maybe IR
 				}
+
+				// Still write to RAM if another command executed
+				if (Core.cart_RAM != null)
+				{
+					if (((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length)
+					{
+						Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000] = value;
+					}
+				}
 			}
 		}