From 1fd620a1f43052de772ba9dcd7e0aaaeaa5ba493 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 13 Apr 2020 13:29:17 -0500 Subject: [PATCH] fix N64 memory callbacks --- .../Consoles/Nintendo/N64/N64.IDebuggable.cs | 4 ++-- BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs index c7dbca888b..0d60e0ab2a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs @@ -77,9 +77,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 throw new NotImplementedException(); } - public IMemoryCallbackSystem MemoryCallbacks { get; } + public IMemoryCallbackSystem MemoryCallbacks => _memoryCallbacks; - private readonly MemoryCallbackSystem _memorycallbacks = new MemoryCallbackSystem(new[] { "System Bus" }); + private readonly MemoryCallbackSystem _memoryCallbacks = new MemoryCallbackSystem(new[] { "System Bus" }); public bool CanStep(StepType type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index e476798f39..e1cd654b17 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -30,8 +30,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 ServiceProvider = new BasicServiceProvider(this); InputCallbacks = new InputCallbackSystem(); - _memorycallbacks.CallbackAdded += AddBreakpoint; - _memorycallbacks.CallbackRemoved += RemoveBreakpoint; + _memoryCallbacks.CallbackAdded += AddBreakpoint; + _memoryCallbacks.CallbackRemoved += RemoveBreakpoint; int SaveType = 0; if (game.OptionValue("SaveType") == "EEPROM_16K")