From 2cbb914b9e693e1545b6df69f30127d1db4773c3 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 13 Apr 2014 18:30:41 +0000 Subject: [PATCH] silly formatting fix from last commit --- .../Consoles/Atari/2600/Mappers/m4A50.cs | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs index 3313a05269..65b53130fc 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Mappers/m4A50.cs @@ -143,43 +143,43 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600 private byte ReadMem(ushort addr, bool peek) { byte val = 0; - if (addr < 0x1000) + if (addr < 0x1000) + { + val = base.ReadMemory(addr); + if (!peek) { - val = base.ReadMemory(addr); - if (!peek) - { - CheckBankSwitch(addr, val); - } + CheckBankSwitch(addr, val); } - else if (addr < 0x1800) // 2K region from 0x1000 - 0x17ff + } + else if (addr < 0x1800) // 2K region from 0x1000 - 0x17ff + { + val = _isRomLow ? RomImage[(addr & 0x7ff) + _sliceLow] + : _ram[(addr & 0x7ff) + _sliceLow]; + } + else if (addr < 0x1E00) // 1.5K region from 0x1800 - 0x1dff + { + val = _isRomMiddle ? RomImage[(addr & 0x7ff) + _sliceMiddle + 0x10000] + : _ram[(addr & 0x7ff) + _sliceMiddle]; + } + else if (addr < 0x1F00) // 256B region from 0x1e00 - 0x1eff + { + val = _isRomHigh ? RomImage[(addr & 0xff) + _sliceHigh + 0x10000] + : _ram[(addr & 0xff) + _sliceHigh]; + } + else if (addr < 0x2000) // 256B region from 0x1f00 - 0x1fff + { + val = RomImage[(addr & 0xff) + (RomImage.Length - 256)]; + if (((_lastData & 0xe0) == 0x60) && ((_lastAddress >= 0x1000) || + (_lastAddress < 0x200))) { - val = _isRomLow ? RomImage[(addr & 0x7ff) + _sliceLow] - : _ram[(addr & 0x7ff) + _sliceLow]; - } - else if (addr < 0x1E00) // 1.5K region from 0x1800 - 0x1dff - { - val = _isRomMiddle ? RomImage[(addr & 0x7ff) + _sliceMiddle + 0x10000] - : _ram[(addr & 0x7ff) + _sliceMiddle]; - } - else if (addr < 0x1F00) // 256B region from 0x1e00 - 0x1eff - { - val = _isRomHigh ? RomImage[(addr & 0xff) + _sliceHigh + 0x10000] - : _ram[(addr & 0xff) + _sliceHigh]; - } - else if (addr < 0x2000) // 256B region from 0x1f00 - 0x1fff - { - val = RomImage[(addr & 0xff) + (RomImage.Length - 256)]; - if (((_lastData & 0xe0) == 0x60) && ((_lastAddress >= 0x1000) || - (_lastAddress < 0x200))) - { - _sliceHigh = (_sliceHigh & 0xf0ff) | ((addr & 0x8) << 8) | - ((addr & 0x70) << 4); - } + _sliceHigh = (_sliceHigh & 0xf0ff) | ((addr & 0x8) << 8) | + ((addr & 0x70) << 4); } + } - _lastData = val; - _lastAddress = (ushort)(addr & 0x1fff); - return val; + _lastData = val; + _lastAddress = (ushort)(addr & 0x1fff); + return val; } public override byte ReadMemory(ushort addr)