From cdbb96dfdb99fe9809df039196c4f3bcb78fafa4 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Tue, 29 Oct 2024 06:50:06 -0700
Subject: [PATCH] set C64 retroachievements memory to RAM rather than System
 Bus

---
 .../RetroAchievements/RetroAchievements.Memory.cs         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.Memory.cs b/src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.Memory.cs
index cac8c6e221..b7c9188b16 100644
--- a/src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.Memory.cs
+++ b/src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.Memory.cs
@@ -321,7 +321,7 @@ namespace BizHawk.Client.EmuHawk
 		// these consoles will use the entire system bus
 		private static readonly ConsoleID[] UseFullSysBus =
 		[
-			ConsoleID.NES, ConsoleID.C64, ConsoleID.AmstradCPC, ConsoleID.Atari7800,
+			ConsoleID.NES, ConsoleID.AmstradCPC, ConsoleID.Atari7800,
 		];
 
 		// these consoles will use the entire main memory domain
@@ -527,6 +527,12 @@ namespace BizHawk.Client.EmuHawk
 						// todo: make this MainMemory
 						mfs.Add(new(domains["RAM"], 0, domains["RAM"].Size));
 						break;
+					case ConsoleID.C64:
+						// no, can't use MainMemory here, as System Bus is that due to init ordering
+						// todo: make this MainMemory
+						// (yes, it's the same between MSX and C64, not a copypaste error!)
+						mfs.Add(new(domains["RAM"], 0, domains["RAM"].Size));
+						break;
 					case ConsoleID.AppleII:
 						mfs.Add(new(domains["Main RAM"], 0, domains["Main RAM"].Size));
 						mfs.Add(new(domains["Auxiliary RAM"], 0, domains["Auxiliary RAM"].Size));