diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs index cead6631f5..aa25648f75 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-SHERO.cs @@ -1,60 +1,59 @@ -using BizHawk.Common; - -namespace BizHawk.Emulation.Cores.Nintendo.NES -{ - public class UNIF_UNL_SHERO : MMC3Board_Base - { - [MapperProp] - public bool RegionAsia = false; - - private byte reg; - - public override bool Configure(NES.EDetectionOrigin origin) - { - switch (Cart.board_type) - { - case "UNIF_UNL-SHERO": - break; - default: - return false; - } - - BaseSetup(); - AutoMapperProps.Apply(this); - return true; - } - - public override void SyncState(Serializer ser) - { - base.SyncState(ser); - ser.Sync("reg", ref reg); - ser.Sync("RegionAsia", ref RegionAsia); - } - - public override void WriteEXP(int addr, byte value) - { - if (addr == 0x100) - { - reg = value; - } - - base.WriteEXP(addr, value); - } - - public override byte ReadEXP(int addr) - { - if (addr == 0x100) - { - return (byte)(RegionAsia ? 0xFF : 00); - } - - return base.ReadEXP(addr); - } - - - public override byte ReadPPU(int addr) +using BizHawk.Common; + +namespace BizHawk.Emulation.Cores.Nintendo.NES +{ + public class UNIF_UNL_SHERO : MMC3Board_Base + { + [MapperProp] + public bool RegionAsia = false; + + private byte reg; + + public override bool Configure(NES.EDetectionOrigin origin) + { + switch (Cart.board_type) + { + case "UNIF_UNL-SHERO": + break; + default: + return false; + } + + BaseSetup(); + AutoMapperProps.Apply(this); + return true; + } + + public override void SyncState(Serializer ser) + { + base.SyncState(ser); + ser.Sync("reg", ref reg); + ser.Sync("RegionAsia", ref RegionAsia); + } + + public override void WriteEXP(int addr, byte value) + { + if (addr == 0x100) + { + reg = value; + } + + base.WriteEXP(addr, value); + } + + public override byte ReadEXP(int addr) + { + if (addr == 0x100) + { + return (byte)(RegionAsia ? 0xFF : 00); + } + + return base.ReadEXP(addr); + } + + + public override byte ReadPPU(int addr) { - // TODO: why doesn't this work? if (addr < 0x2000) { if ((reg & 0x40) > 0) @@ -71,10 +70,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } else - return VRAM[addr]; - } - - public override void WritePPU(int addr, byte value) + return VRAM[addr]; + } + + public override void WritePPU(int addr, byte value) { if (addr < 0x2000) { @@ -89,27 +88,27 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } else - VRAM[addr] = value; - } - - protected override int Get_CHRBank_1K(int addr) - { - if (addr < 0x800) - { - return base.Get_CHRBank_1K(addr) | ((reg & 8) << 5); - } - else if (addr < 0x1000) - { - return base.Get_CHRBank_1K(addr) | ((reg & 4) << 6); - } - else if (addr < 0x1800) - { - return base.Get_CHRBank_1K(addr) | ((reg & 1) << 8); - } - else - { - return base.Get_CHRBank_1K(addr) | ((reg & 2) << 7); - } - } - } -} + VRAM[addr] = value; + } + + protected override int Get_CHRBank_1K(int addr) + { + if (addr < 0x800) + { + return base.Get_CHRBank_1K(addr) | ((reg & 8) << 5); + } + else if (addr < 0x1000) + { + return base.Get_CHRBank_1K(addr) | ((reg & 4) << 6); + } + else if (addr < 0x1800) + { + return base.Get_CHRBank_1K(addr) | ((reg & 1) << 8); + } + else + { + return base.Get_CHRBank_1K(addr) | ((reg & 2) << 7); + } + } + } +}