diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 25f0b0aead..6d5af3b224 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -164,7 +164,7 @@ namespace BizHawk.Client.EmuHawk public void Restart() { _rom = GetRomBytes(); - _romDomain = MemoryDomain.FromByteArray("File on Disk", MemoryDomain.Endian.Little, _rom); + _romDomain = new MemoryDomainByteArray("File on Disk", MemoryDomain.Endian.Little, _rom, true, 1); if (_domain.Name == _romDomain.Name) { diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs index 3db494bc03..b5ddc5d8db 100644 --- a/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs +++ b/BizHawk.Emulation.Common/Base Implementations/MemoryDomain.cs @@ -1,6 +1,4 @@ -using System; - -namespace BizHawk.Emulation.Common +namespace BizHawk.Emulation.Common { /// /// A memory region and the functionality to read/write from it @@ -25,16 +23,6 @@ namespace BizHawk.Emulation.Common public abstract void PokeByte(long addr, byte val); - /// - /// creates a memorydomain that references a managed byte array - /// - /// if false, writes will be ignored - [Obsolete] - public static MemoryDomain FromByteArray(string name, Endian endian, byte[] data, bool writable = true, int wordSize = 1) - { - return new MemoryDomainByteArray(name, endian, data, writable, wordSize); - } - public override string ToString() { return Name; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs index a5a543bf25..d8411ade8b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs @@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public MemoryDomain GetExRAM() { - return MemoryDomain.FromByteArray("ExRAM", MemoryDomain.Endian.Little, EXRAM); + return new MemoryDomainByteArray("ExRAM", MemoryDomain.Endian.Little, EXRAM, true, 1); } ///