diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllers.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllers.cs index 3bd2179713..ae3eea6c39 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllers.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoControllers.cs @@ -260,8 +260,8 @@ namespace BizHawk.Emulation.Cores.ColecoVision BoolButtons = BaseBoolDefinition .Select(b => "P" + PortNum + " " + b) .ToList(), - FloatControls = { "P" + PortNum + " Disc X"}, - FloatRanges = { new[] { -360.0f, 0, 360.0f }} + FloatControls = { "P" + PortNum + " Disc X", "P" + PortNum + " Disc Y" }, + FloatRanges = { new[] { -127.0f, 0, 127.0f }, new[] { -127.0f, 0, 127.0f } } }; } diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs index 5223a5aff2..52da6f992f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.IMemoryDomains.cs @@ -37,6 +37,12 @@ namespace BizHawk.Emulation.Cores.ColecoVision }, 1) }; + if (use_SGM) + { + var SGMRam = new MemoryDomainByteArray("SGM RAM", MemoryDomain.Endian.Little, SGM_high_RAM, true, 1); + domains.Add(SGMRam); + } + SyncAllByteArrayDomains(); memoryDomains = new MemoryDomainList(_byteArrayDomains.Values.Concat(domains).ToList()); diff --git a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs index 1a5b88475c..613e612d0e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs +++ b/BizHawk.Emulation.Cores/Consoles/Coleco/ColecoVision.cs @@ -51,15 +51,15 @@ namespace BizHawk.Emulation.Cores.ColecoVision skipbios = false; } + use_SGM = _syncSettings.UseSGM; + Console.WriteLine("Using the Super Game Module"); + LoadRom(rom, skipbios); SetupMemoryDomains(); _tracer.Header = _cpu.TraceHeader; ser.Register(_cpu); ser.Register(_tracer); - - use_SGM = _syncSettings.UseSGM; - Console.WriteLine("Using the Super Game Module"); } private readonly Z80A _cpu;