diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs index 987b62b935..ac3da707a4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs @@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(prg_bank_32k), ref prg_bank_32k); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -105,7 +105,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(isMapper79), ref isMapper79); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs index 5ed0c27c34..7c44a1c84f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) @@ -58,7 +58,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } prg_mask_32k = Cart.prg_size / 32 - 1; - SetMirrorType(NesBoardBase.EMirrorType.OneScreenA); + SetMirrorType(EMirrorType.OneScreenA); return true; } @@ -76,12 +76,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public override void WritePrg(int addr, byte value) { if (Rom != null && bus_conflict) + { value = HandleNormalPRGConflict(addr,value); + } + prg = value & prg_mask_32k; - if ((value & 0x10) == 0) - SetMirrorType(NesBoardBase.EMirrorType.OneScreenA); - else - SetMirrorType(NesBoardBase.EMirrorType.OneScreenB); + SetMirrorType((value & 0x10) == 0 + ? EMirrorType.OneScreenA + : EMirrorType.OneScreenB); } public override void SyncState(Serializer ser) @@ -89,6 +91,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES base.SyncState(ser); ser.Sync(nameof(prg), ref prg); } - } } \ No newline at end of file diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs index b5cb93290e..4b785e9df1 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs @@ -66,7 +66,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SyncPRG(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -222,10 +222,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case 9: switch (value & 3) { - case 0: SetMirrorType(NesBoardBase.EMirrorType.Vertical); break; - case 1: SetMirrorType(NesBoardBase.EMirrorType.Horizontal); break; - case 2: SetMirrorType(NesBoardBase.EMirrorType.OneScreenA); break; - case 3: SetMirrorType(NesBoardBase.EMirrorType.OneScreenB); break; + case 0: SetMirrorType(EMirrorType.Vertical); break; + case 1: SetMirrorType(EMirrorType.Horizontal); break; + case 2: SetMirrorType(EMirrorType.OneScreenA); break; + case 3: SetMirrorType(EMirrorType.OneScreenB); break; } break; case 0xA: diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs index 141f7a841f..4d377ecd26 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg_bank_mask_32k; byte prg_bank_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs index 4128df63a7..2270289904 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs index fc9cf806c8..c3f72da372 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _chrReg; private int _prgReg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs index f64dc32b49..ca89a92785 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs @@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(chr_bank_8k), ref chr_bank_8k); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs index 5ad44dc794..28d55574ca 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs @@ -24,7 +24,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr; bool chr_enabled = true; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs index 3bacbf9817..a1958d565d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state int chr; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) @@ -32,7 +32,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //TODO - assert that mirror type is vertical? //set it in the cart? - SetMirrorType(NesBoardBase.EMirrorType.Vertical); + SetMirrorType(EMirrorType.Vertical); return true; } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs index 9ad6b97735..44b57eea69 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs @@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(prg_banks_16k), ref prg_banks_16k, false); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) @@ -104,7 +104,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(prg_page), ref prg_page); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs index 2a3f82226b..dc88a8ef1e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_bank_mask_16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs index f84c76ac7b..89a72a1fe3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs @@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte bank, mode; private bool is_2k_bank, is_not_2k_bank; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -208,7 +208,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte bank, mode; private bool is_2k_bank, is_not_2k_bank; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -397,7 +397,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _irqCount; private bool _irqA, _irqEnable; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs index 0a990442ec..154918fb70 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES // this could be broken down into more sensibly named variables byte[] exp = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs index 601b9cb3ec..084c61b07a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs @@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES audio.SyncState(ser); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs index 31c93bd726..a925e6bf55 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prgMask16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs index 5695f0504f..2f94f54cc8 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int irq_count; private const int IRQ_DESTINATION = 0x10000; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs index 48c52b42dc..5bf807ff40 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs @@ -7,7 +7,7 @@ int prg; int prg_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs index 6178ab4c41..ab822f51bb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs @@ -10,7 +10,7 @@ int prginner; int prgouter; // guaranteed to be 0 on powerup - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs index e587cf6655..e32247afed 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs @@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs index d2d7511734..49bfb2afd9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs @@ -22,7 +22,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state int prg, chr; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) @@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES chr_mask = (Cart.chr_size / 8) - 1; SetMirrorType(Cart.pad_h, Cart.pad_v); - if(origin == NES.EDetectionOrigin.INES) + if(origin == EDetectionOrigin.INES) Console.WriteLine("Caution! This board (inferred from iNES) might have wrong mirr.type"); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs index d1522e9218..7e85eead1d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs @@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state int prg_bank_32k, chr_bank_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs index a967560813..9f0d073ae5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs @@ -3,13 +3,18 @@ using BizHawk.Common; namespace BizHawk.Emulation.Cores.Nintendo.NES { + public enum EDetectionOrigin + { + None, BootGodDB, GameDB, INES, UNIF, FDS, NSF + } + public interface INesBoard { // base class pre-configuration void Create(NES nes); // one-time inherited classes configuration - bool Configure(NES.EDetectionOrigin origin); + bool Configure(EDetectionOrigin origin); // one-time base class configuration (which can take advantage of any information setup by the more-informed Configure() method) void PostConfigure(); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs index 1d7a034277..c8b5393818 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public sealed class IREM_74_161_161_21_138 : NesBoardBase { int chr, prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs index 9c90c38ab3..8c5674008b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs index d3f3a5212a..d3bdfaff96 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs @@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(mirror_mode), ref mirror_mode); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs index 0f604d662f..27b25e055d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs @@ -34,7 +34,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SyncIRQ(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs index 55d4f80f79..51447f5234 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs @@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr; int chr_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs index a9c429a457..8a6f43d0be 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs @@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr; int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs index cc36694d5d..1dceb13f1d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs @@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] prg_banks_16k = new byte[2]; byte[] chr_banks_8k = new byte[1]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs index df9df2c267..40b2b85e04 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs @@ -23,7 +23,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] prg_banks_16k = new byte[2]; byte[] chr_banks_8k = new byte[1]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs index 4172c3f03f..8d0881063c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool irqcountpaused; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs index d5fa7b2627..999e5f4ac5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs @@ -25,7 +25,7 @@ Other chips used: Sunsoft-1 { int chr, prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs index 51ae10546e..c03357cf91 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] eRAM = new byte[4]; int chr_bank_mask_8k, prg_bank_mask_16k, prg_bank_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs index 805c6efcd3..508771eb01 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg_bank_mask_32k = 0; int chr_bank_mask_8k = 0; bool reg_0_locked = false; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs index 79faedfa62..9b1bae5c54 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool wram_h_enabled, wram_l_enabled; bool wram_h_enabled_write, wram_l_enabled_write; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs index 06659369c6..cfab9a7ed5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs @@ -51,20 +51,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } bool oldIrqType; - public NesBoardBase.EMirrorType MirrorType + public EMirrorType MirrorType => mirror switch { - get - { - switch (mirror) - { - default: - case 0: return NesBoardBase.EMirrorType.Vertical; - case 1: return NesBoardBase.EMirrorType.Horizontal; - case 2: return NesBoardBase.EMirrorType.OneScreenA; - case 3: return NesBoardBase.EMirrorType.OneScreenB; - } - } - } + 1 => EMirrorType.Horizontal, + 2 => EMirrorType.OneScreenA, + 3 => EMirrorType.OneScreenB, + _ => EMirrorType.Vertical + }; protected NesBoardBase board; public MMC3(NesBoardBase board, int num_prg_banks) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs index 63023b48ff..acd9df2caa 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper012 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs index 47168b78b2..8d6a474902 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { int exreg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs index 0288816333..4062b6f79a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs @@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //http://wiki.nesdev.com/w/index.php/INES_Mapper_044 public class Mapper044 : MMC3Board_Base { - public sealed override bool Configure(NES.EDetectionOrigin origin) + public sealed override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs index 1939fbc9f9..505bc00087 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //http://wiki.nesdev.com/w/index.php/INES_Mapper_044 public sealed class Mapper049 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs index 91b728a267..f4b14b9c10 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg_or = 0; int chr_or = 0; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs index e1aacc75d4..c4067350df 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { //http://wiki.nesdev.com/w/index.php/INES_Mapper_074 - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs index 21d5557580..39a4fcd90a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] sec = { 0, 3, 1, 5, 6, 7, 2, 4 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs index d899c85a26..6ffeb360fd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //VirtuaNES has its own class that implements 248. I think it's wrong (MAME and/or MESS may have switched to using 115 at some point) public sealed class Mapper115 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs index b344585bb7..1bfd245c4e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private readonly byte[] lut = { 0x00, 0x83, 0x42, 0x00 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs index 27fe4a3f6e..e4b6980244 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] sec = { 0, 3, 1, 5, 6, 7, 2, 4 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs index 41fc3df9cc..372c4ec7d9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private byte reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs index 5d3951d2c9..0760ba0ab9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool latch1 = false; int real_chr_mask; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs index 8825f225a5..377a3d43d0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs @@ -2,7 +2,7 @@ { public sealed class Mapper182 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs index fb48f48794..7dd08586c2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private readonly byte[] prot_data = { 0x83, 0x83, 0x42, 0x00 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs index a72c9c3bba..5ec04c29a0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper189 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs index 81906d329d..84e8ce4917 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper191 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs index 69e664dff2..2e9fbf4803 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs @@ -4,7 +4,7 @@ { //http://wiki.nesdev.com/w/index.php/INES_Mapper_192 - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs index 4e67439a46..d2d69b02b2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs @@ -4,7 +4,7 @@ { //http://wiki.nesdev.com/w/index.php/INES_Mapper_194 - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs index 464011cea4..0e9c6e842c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs @@ -4,7 +4,7 @@ { private int vram_bank_mask_1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs index 235dc5627a..212faf91a3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int vram_bank_mask_1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs index ce590d6826..9c490c4235 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool prgmode; int prgreg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs index 26dccec577..36ebc19fee 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class Mapper197 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs index 5b94d1c4f7..bd0e6cc350 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs @@ -3,7 +3,7 @@ public class Mapper198 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs index 7f0ad26291..dc1a50c6c3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private byte[] exRegs = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs index 7ba03cdd41..69769b2692 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int block; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs index 64c51a4b5d..f3708b997f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs @@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES 0x09, 0x19, 0x49, 0x59, 0x09, 0x19, 0x49, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs index 12471fe4c6..f6b0c72ce4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs @@ -42,7 +42,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES }; */ - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs index 44d1d81a58..b1c1013fe0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] regs_sec = { 0, 6, 3, 7, 5, 2, 4, 1 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs index 9b4173571c..5e0c0f33e5 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public byte bits_rev, reg_value; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs index 63335ba339..93c738e20e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs @@ -3,7 +3,7 @@ // TODO public sealed class Mapper223 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs index 41c5c84299..2db9a16033 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private readonly int[] lut = { 0x00, 0x02, 0x02, 0x03 }; private byte reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs index 4b2b04a17c..7057931115 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //http://wiki.nesdev.com/w/index.php/INES_Mapper_245 bool chr_mode; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs index 7b0ca9a453..011809c444 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool piratecrap = false; // mmc3 with pirate crap bolt on - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs index 9da002d9ce..d910ba32e1 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs @@ -5,7 +5,7 @@ // presumably the board contains an MMC3 clone with some unique edge case behavior; unknown public sealed class Mapper250 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs index 1969fe6bf0..7007f06ae1 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private byte[] regs = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs index 6cbf820bac..5ec35de3fd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs @@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SetMirrorType(mmc3.MirrorType); //often redundant, but gets the job done } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs index d046836b4b..c8a1c84767 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] regs_sec = { 0, 2, 6, 1, 7, 3, 4, 5 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs index dd4a3f2e4d..bd4fa8c30d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int[] exchr = new int[8]; byte exnmt; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs index bd60c78ceb..ff9e5c9abf 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public int[] nametables = new int[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs index 93c8062465..12d362a992 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //just high speed and pinbot with an MMC3 and some custom logic to select between chr rom and chr ram public sealed class TQSROM : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs index b3185933ab..7827498ef0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs @@ -2,7 +2,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public sealed class TVROM : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs index c61460d75a..e916df1874 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs @@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs index fb1ee97290..98dfe35b74 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state byte[] prg_banks_8k = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs index 40d0f6d0bb..f9bc70049d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs @@ -20,7 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prglo; int prghi; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs index c7479e540b..9efcc31635 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs @@ -7,7 +7,7 @@ int chr; int prg_bank_mask_16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs index d42bd5a29b..622cc7df97 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs @@ -62,7 +62,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(flash_rom), ref flash_rom, true); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs index b74245cd4d..eea2983120 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs index db54355050..8a6d29589a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool M; byte P; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs index 71d980c67a..e550f6a589 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg_mask, chr_mask; //state int prg, chr; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs index 9556788b66..0783da5d04 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int irqcnt = 0; bool irqactive = false; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs index 1de349df85..1f3c5be7cd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr; bool regenable; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs index aa24fd8ce8..6e677d1fa6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int irqcnt = 0; bool irqenable = false; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs index 785941d5f5..818b67f1b0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private static int[] lut = { 4, 3, 5, 3, 6, 3, 7, 3 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs index 6924a89c6c..f519c6b775 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] regs = new byte[4]; bool lock_regs = false; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs index fb8c0e0520..427ce8f792 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs @@ -51,7 +51,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES return Rom[addr + (offset * 0x8000)]; } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs index 5b0249f7ad..9778d1ec9f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _bank; private int _mode = 2; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs index 221cf7cb4b..fa3da6d6b7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private bool Prg16kMode => _reg0.Bit(4); - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -90,7 +90,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private bool Prg16kMode => _reg0.Bit(4); - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs index 40c285938e..be98448695 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES [MapperProp] public int Mapper57_DipSwitch = 0; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs index 92ab5b854f..fc0cc0be50 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr_reg; int prg_reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs index 7a375521d9..9cae84e6c2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg0, prg1, prg2, prg3; bool open_bus; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs index e1aebe943f..ab8f9056ee 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { Sunsoft5BAudio audio; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) @@ -87,7 +87,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SyncIrq(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs index ebc23250fe..d5978cf6f2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { holydiver = false; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs index ee9249bfd3..afbef18621 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs @@ -63,7 +63,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int a12_old; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs index 0a94611c8f..8173732dad 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr_bank_mask_2k, prg_bank_mask_8k; MMC3 mmc3; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs index 4f71582ed9..e9f3b22457 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper101.cs @@ -21,7 +21,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(chr_bank_8k), ref chr_bank_8k); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs index ec92c77622..ba4c9876fb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper103.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg; bool romenable; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper106.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper106.cs index 2b9d8aaa20..34027bb0ab 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper106.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper106.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private bool IRQa; private int IRQCount; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs index 3856e7c9be..88f97b0804 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper107.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(chr_bank_8k), ref chr_bank_8k); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs index f53cef3bd0..b3e48f56a7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper108.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs index 6934dc2540..b03f1d6e03 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper116.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SetMirrorType(mmc3.MirrorType); //often redundant, but gets the job done } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { BaseSetup(); return true; @@ -61,7 +61,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SyncIRQ(mmc3.mmc3.irq_pending); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { string oldBoardType = Cart.board_type; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs index d198606c95..3afb43fd17 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper120.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper125.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper125.cs index 5863dc1c57..efdfc48242 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper125.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper125.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte reg; private int prg_bank_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs index a76ca82bdf..5caa84c6e7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper132.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool is172, is173; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper136.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper136.cs index d453c4415e..f192f383db 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper136.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper136.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _chrBankMask_8k; private int _chrRegister; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper142.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper142.cs index e40d3d7e5e..ecb8c9545d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper142.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper142.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte _irqA; private int _irqCount; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs index 508660e358..7e65772779 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper143.cs @@ -6,7 +6,7 @@ // dancing blocks refuses to run; see comments below public sealed class Mapper143 : NesBoardBase { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper147.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper147.cs index 496a1e83aa..c0c1c8e5a7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper147.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper147.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _chrRegister; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper150.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper150.cs index a0e184b66f..3566825ffc 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper150.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper150.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int chr_mask; private int prg_mask; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs index 7161e80e56..706aa675c3 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper156.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg; int[] chr = new int[8]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper162.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper162.cs index 9bd83253fe..53f048ab56 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper162.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper162.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] reg = new byte[8]; private int prg_bank_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs index d4d08d9922..86bcef4b1e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper164.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_bank_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs index 33245f5385..a3016243ac 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper168.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr = 0; int irqclock = 2048; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper170.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper170.cs index 98d61c096c..7f42b27105 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper170.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper170.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private byte reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper175.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper175.cs index b58d7bd345..0ba89a034f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper175.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper175.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prgRegC; private int prgRegE; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs index b3f43751f4..ae587d94f6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper176.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] chr_banks_8k = new byte[1]; Bit sbw; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs index 5c88b9d164..4a84f95739 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper177.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs index 559005162f..fdcb4a999b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper178.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] prg_banks_32k = new byte[1]; int reg4802; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs index 1de39f916b..4ad544e7dd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper180.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper183.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper183.cs index 97035af078..c7db84118e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper183.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper183.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_bank_mask_8k, chr_bank_mask_1k, IRQPre=341; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper186.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper186.cs index 27569da84e..b887d89d5b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper186.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper186.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] _SRAM = new byte[3072]; private byte[] regs = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper188.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper188.cs index f809b753a2..f14f8f8d39 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper188.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper188.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES // state int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper190.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper190.cs index 05d83d4ff8..fdb37cba81 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper190.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper190.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES base.SyncState(ser); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs index 6e985c8e5c..a720d6c35f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper193.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int chr_bank_mask_2k; private byte[] chr_banks_2k = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs index 6e0e7043a7..e991dfaa7f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper200.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg_bank_mask_16k; int chr_bank_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs index aac3c31e1a..7390cd7ccc 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper201.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public int reg; public int prg_bank_mask_32k; public int chr_bank_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper202.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper202.cs index a4dd94e387..1d9259903b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper202.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper202.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _reg; private bool _isprg32KMode; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs index 04ab4038c4..67345bc996 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper203.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg_bank_mask_16k; int chr_bank_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper204.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper204.cs index 8849c21b9e..3cb4d57c2d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper204.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper204.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_mask_16k, chr_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper212.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper212.cs index f3a1f7765e..a2238a1b5b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper212.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper212.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _reg; private int prg_bank_mask_32k, prg_bank_mask_16k, chr_bank_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper213.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper213.cs index c68f006a0a..7f88d33dde 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper213.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper213.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int _reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper214.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper214.cs index 8806ce0031..c99892c22e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper214.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper214.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int _chrReg, _prgReg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs index d5c5223039..942a71fff4 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper218.cs @@ -8,7 +8,7 @@ int prg_byte_mask; int chr_addr_mask; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper220.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper220.cs index a7107f42e3..a37366d983 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper220.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper220.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] reg = new byte[8]; private int prg_mask_2k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper221.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper221.cs index 93e063898b..3fd70a26b2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper221.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper221.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { int[] regs = new int[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs index 7d0a9f4782..8de8a1934b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper222.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int irq_time = 0; bool irq_counting = false; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs index 034f30614f..173e7069f6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper225.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] eRAM = new byte[4]; int chr_bank_mask_8k, prg_bank_mask_16k, prg_bank_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs index 7e6822f94f..345a70afb6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper226.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private bool resetFlag = false; private bool resetSwitchMode = false; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { int prg_mask_hack = 1; switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs index f18bb03ac0..dd6466d8e0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper227.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES // 1200-in-1 // [NJXXX] Xiang Shuai Chuan Qi - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs index e1e378bfd8..bea95a0e05 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper230.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public int chip1_prg_bank_mask_16k = 0x1F; public int chip1_offset = 0x20000; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs index 413e745977..c06bce04b2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper231.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public int prg_reg; public int prg_bank_mask_16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs index 17de36d60d..d3db9e8ab8 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper233.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public int prg_page; public bool prg_mode; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper235.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper235.cs index 8523a531a0..0d73510b87 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper235.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper235.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prg16BankMask; private int _prg32BankMask; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs index 4d165bc058..6312a9f026 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper236.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte chr_bank; private byte bank_mode; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs index 4989330bf3..fb3ce2e59d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper240.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state int prg_bank_32k, chr_bank_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs index e56e3566b0..82658f49ca 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper241.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state byte[] prg_banks_32k = new byte[1]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs index 809fb246b0..e3de209161 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper242.cs @@ -21,7 +21,7 @@ mirroring - both { int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs index 2d25a74fe9..824f9f455a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper243.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte[] regs = new byte[8]; int chr_bank_mask_8k, prg_bank_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper244.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper244.cs index 652acabda0..a144cec4b0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper244.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper244.cs @@ -5,7 +5,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { public class Mapper244 : NesBoardBase { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs index 551d15e785..0f328bbe50 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper246.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr_bank_mask_2k; byte[] chr_banks_2k = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper252.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper252.cs index a5d69019b2..3d2f0bd259 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper252.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper252.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _irqLatch, _irqClock, _irqCount; private bool _irqA; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper253.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper253.cs index 4c416b51f2..285754216f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper253.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper253.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prgBankMask8K, _chrBankMask1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs index 635444dca8..f637400847 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper50.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ushort irq_counter = 0; bool irq_ready = false; int ppu_cyclecount = 0; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs index 75e5d09f66..993f38c8f6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper60.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private const int DipSwitchMask = 3; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -86,7 +86,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int resetSwitch = 0; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs index 344aeac5a1..5bd2bffbbf 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper61.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public bool prg_mode; public int prg_byte_mask; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs index 9fa81bcfa9..03cb8eb718 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper62.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr_reg; int prg_reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs index 736865b817..5ec0b69da6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NES-EVENT.cs @@ -93,7 +93,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES if (ser.IsReader) Sync(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs index 91974fafcb..9677c9321e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NROM.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //state //(none) - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure. //contrary to expectations, some NROM games may have WRAM if theyve been identified through iNES. lame. diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NSFBoard.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NSFBoard.cs index 43f34d03f6..413b503297 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NSFBoard.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NSFBoard.cs @@ -68,7 +68,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES /// int ButtonState; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { Cart.wram_size = 8; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs index 6f674b7170..c59c1a623b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot129_163.cs @@ -52,7 +52,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(prgram_write), ref prgram_write); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs index 5427216057..8612094e6a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot175_340.cs @@ -36,7 +36,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int[] chr = new int[8]; bool wramenable; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs index 27e76b074c..73e12764a9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/DRROM.cs @@ -3,7 +3,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //this board contains a Namcot 109 and some extra ram for nametables public sealed class DRROM : Namcot108Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs index 8ce4421221..e1a6a9f642 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper076.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int[] chr = new int[4]; int port; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs index 92694e8eb7..7bc38913a0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper088.cs @@ -18,7 +18,7 @@ //configuration int chr_bank_mask_1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs index 30c26714a0..4b075d55a9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper095.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //wires the mapper outputs to control the nametables. check out the companion board TLSROM public sealed class Mapper095 : Namcot108Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs index 247980dfa0..2b6329e284 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper112.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int[] _chrRegs1K = new int[8]; private byte[] _prgRegs8K = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs index 2389c239ce..70e43908f2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper154.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //configuration int chr_bank_mask_1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs index f77b797012..73473141a9 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Mapper206.cs @@ -4,7 +4,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES [NesBoardImplPriority] public sealed class Mapper206 : Namcot108Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //analyze board type switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs index e8380191d1..0f3619acb6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NanJing.cs @@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool strobe = true; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs index be96f09227..b65dd3aaf0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NesBoardBase.cs @@ -4,19 +4,18 @@ using BizHawk.Common; namespace BizHawk.Emulation.Cores.Nintendo.NES { + /// + /// These are used by SetMirroring() to provide the base class nametable mirroring service. + /// Apparently, these are not used for internal build configuration logic + /// + public enum EMirrorType + { + Vertical, Horizontal, OneScreenA, OneScreenB + } + [NesBoardImpl] public abstract class NesBoardBase : INesBoard { - /// - /// These are used by SetMirroring() to provide the base class nametable mirroring service. - /// Apparently, these are not used for internal build configuration logic - /// - public enum EMirrorType - { - Vertical, Horizontal, - OneScreenA, OneScreenB - } - public virtual void Create(NES nes) { NES = nes; @@ -28,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public Dictionary InitialRegisterValues { get; set; } - public abstract bool Configure(NES.EDetectionOrigin origin); + public abstract bool Configure(EDetectionOrigin origin); public virtual void ClockPpu() { } public virtual void ClockCpu() { } public virtual void AtVsyncNmi() { } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs index 7d44a0787d..fb4aac1e19 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/NovelDiamond.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg; int chr; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs index 85d0742081..629e78e9f6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/PxROM_FxROM.cs @@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SyncPRG(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sachen8259.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sachen8259.cs index 7ca80e5fe4..36c3f582a7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sachen8259.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sachen8259.cs @@ -21,7 +21,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int[] chr = new int[4]; // 6 bits of chr, 3 from an outer bank bool simple; // when true, we're in some sort of "simplified" mode - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -184,7 +184,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg; int[] chr = new int[8]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs index ad475b678d..2ca26fe88f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SachenSimple.cs @@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int chr_mask; int prg_addr_mask; // some carts have 16KB prg unswappable - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Subor.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Subor.cs index dd15115ba4..f33b66af36 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Subor.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Subor.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] regs = new byte[4]; private bool is167; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs index 491f5f94de..69b8640f8d 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int left_piece = 0; int right_piece = 3; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs index 36648b69ba..10e8e2b643 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft1_Alt.cs @@ -15,7 +15,7 @@ { int prg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { if (Cart.board_type != "SUNSOFT-1" || Cart.pcb != "SUNSOFT-4") return false; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs index fe1500be38..c049bb5576 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m89.cs @@ -13,7 +13,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs index 176772aa0a..b85c03c783 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft2_m93.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs index 04bddebf06..dde73206f0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft3.cs @@ -43,7 +43,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES SyncIRQ(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -122,10 +122,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case 0x6800: //0xE800: switch (value & 3) { - case 0: SetMirrorType(NesBoardBase.EMirrorType.Vertical); break; - case 1: SetMirrorType(NesBoardBase.EMirrorType.Horizontal); break; - case 2: SetMirrorType(NesBoardBase.EMirrorType.OneScreenA); break; - case 3: SetMirrorType(NesBoardBase.EMirrorType.OneScreenB); break; + case 0: SetMirrorType(EMirrorType.Vertical); break; + case 1: SetMirrorType(EMirrorType.Horizontal); break; + case 2: SetMirrorType(EMirrorType.OneScreenA); break; + case 3: SetMirrorType(EMirrorType.OneScreenB); break; } break; case 0x7800: //0xF800: diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs index 5f3e8964f8..2757e058cb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Sunsoft4.cs @@ -28,7 +28,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(flag_r), ref flag_r); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs index 599133d684..addd58db3b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -70,13 +70,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public int chr_mode; public int prg_mode; public int prg_slot; // complicated - public NesBoardBase.EMirrorType mirror; - static readonly NesBoardBase.EMirrorType[] _mirrorTypes = + public EMirrorType mirror; + static readonly EMirrorType[] _mirrorTypes = { - NesBoardBase.EMirrorType.OneScreenA, - NesBoardBase.EMirrorType.OneScreenB, - NesBoardBase.EMirrorType.Vertical, - NesBoardBase.EMirrorType.Horizontal + EMirrorType.OneScreenA, + EMirrorType.OneScreenB, + EMirrorType.Vertical, + EMirrorType.Horizontal }; //register 1,2: @@ -146,7 +146,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES prg_slot = 1; chr_mode = 1; scnt.Reset(); - mirror = NesBoardBase.EMirrorType.Horizontal; + mirror = EMirrorType.Horizontal; SyncCHR(); SyncPRG(); } @@ -393,7 +393,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync("VS_CIRAM", ref CIRAM_VS, false); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -542,7 +542,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { //this uses a CHR bit to select WRAM banks //TODO - only the latter 8KB is supposed to be battery backed - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -584,7 +584,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { //SXROM's PRG behaves similar to SuROM (and so inherits from it) //it also has some WRAM select bits like SoROM - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -622,7 +622,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES class SuROM : SxROM { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //SUROM uses CHR A16 to control the upper address line (PRG A18) of its 512KB PRG ROM. diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs index 5aee0c972d..edfe51e9eb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TAITO_74_161_161_32.cs @@ -14,7 +14,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES byte prg_bank_16k; byte[] prg_banks_16k = new byte[2]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs index bdac0b16ed..acf473a03e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN-800032.cs @@ -49,7 +49,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES Sync(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs index 5422427659..d6efde85f2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/TENGEN_800008.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES int prg; int chr; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs index 813568ce11..17b554d37f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_TC0190FMC.cs @@ -82,7 +82,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(mirror_mode), ref mirror_mode); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs index 4ee5ee6536..60b7eba2eb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_005.cs @@ -57,7 +57,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(wramenable), ref wramenable); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs index 8c32b97d00..e0362935bb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Taito_X1_017.cs @@ -22,7 +22,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync("wramenable_" + i, ref wramenable[i]); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs index a0c20d018e..8de6863b09 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF-DREAMTECH01.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES // Korean Igo (Unl) [U][!] private int reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs index e1beeef777..aeeee047b8 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-12-IN-1.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte[] regs = new byte[2]; private byte ctrl; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs index a4609a02d8..f6d0ab083f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-190in1.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int _reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs index 342656a76c..c332ec4a28 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-64in1-NR.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private byte[] regs = new byte[4]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs index 7f0378fba6..8388113797 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-810544-C-A1.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int latche; private int prg_mask_32k, prg_mask_16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs index 99e5ef4971..592cf279db 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-8157.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prgMask16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs index de40fce0ee..76e6e61165 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-A65AS.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prgMask16k; private int prgMask32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs index 375b2a6901..545c251366 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-BS-5.cs @@ -15,7 +15,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private const int DipSwitchMask = 3; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs index 98a69c6dd9..94fa9d57df 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-D1038.cs @@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private bool Prg16kMode => _reg.Bit(7); - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs index 9a28b6a53f..465bb932bf 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2004.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prgMask32k; private int _wramOffset; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs index 7886d85b60..28e8a102c6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-GS-2013.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _wramPage = 0x3E000; private int _rom2Offset = 0x40000; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs index bbd2976a7f..e870b01ac0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-Ghostbusters63in1.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES [MapperProp] public int Ghostbusters63in1_chip_22_select; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs index 74a29b50e7..2ae218a926 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-NTD-03.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int latche; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs index 724bdaa11b..77cc8e8308 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-T-262.cs @@ -11,7 +11,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _base; private int _bank; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs index 1e56c67a08..5656d8073c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC-WS.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte _reg0; private byte _reg1; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs index 6e5b3e4cfc..d035ed6391 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMCFK23C.cs @@ -18,7 +18,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_mask_8k, chr_mask_1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs index 1d8d314166..d08b708f83 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BMC_Super24in1SC03.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private byte[] exRegs = new byte[3]; private readonly int[] masko8 = { 63, 31, 15, 1, 3, 0, 0, 0 }; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs index 5df944fe10..3fe02fce77 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_BTL-Mario1-MALEE2.cs @@ -2,7 +2,7 @@ { public sealed class Mapper055 : NesBoardBase { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs index fe9c5b1651..c1a8b8d388 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-43272.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int latche; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs index 9e51f1995e..b3b32ed124 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AC08.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs index b01fb1c9df..3c4376b09f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-AX5705.cs @@ -12,7 +12,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prgMask8k; private int _chrMask1k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs index 2eb9b74cf8..ef3cb267fc 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-BB.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte reg, chr; private int prg_mask_32k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs index 48ea529e4d..c04364ef49 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-CC-21.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public class UNIF_UNL_CC_21 : NesBoardBase { int _reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs index f3e970c78e..7b5a86fbd7 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-EDU2000.cs @@ -7,7 +7,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int _prgMask32; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs index d270a8e947..77728fa140 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KOF97.cs @@ -3,7 +3,7 @@ // adapted from Nestopia src public sealed class UNIF_UNL_KOF97 : MMC3Board_Base { - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs index b5c37247e7..f2b5709302 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7012.cs @@ -6,7 +6,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES { private int reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs index 551b8666c7..86492bcb60 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-KS7013B.cs @@ -8,7 +8,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte reg; private int prg_mask_16k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs index 13f0d090a9..7f40426c98 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-LH10.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_bank_mask_8; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) 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 36d2026172..c925d2e725 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 @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private byte reg; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs index 3c08d88fd6..a13509afcb 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL-TF1201.cs @@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES private int prg_mask_8k; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs index 69f760c0f1..5035e267a0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_DripGame.cs @@ -76,7 +76,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.EndSection(); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs index a4b919a597..c55863f5d6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UNIF/UNIF_UNL_SMB2J.cs @@ -10,7 +10,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES bool irqenable = false; bool swap; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs index 36f04294bc..a23b447eab 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs @@ -30,7 +30,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //let's make the extra space here, instead of in the main NES to avoid confusion byte[] CIRAM_VS = new byte[0x800]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { adjust_prg = (x) => x; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs index 0c7af15404..ea90b2213a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs @@ -37,7 +37,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { @@ -159,9 +159,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case 0x1000: //[.... .BAM] Mirroring, CHR reg high bits if(value.Bit(0)) - SetMirrorType(NesBoardBase.EMirrorType.Horizontal); + SetMirrorType(EMirrorType.Horizontal); else - SetMirrorType(NesBoardBase.EMirrorType.Vertical); + SetMirrorType(EMirrorType.Vertical); chr_regs_4k[0] &= 0x0F; chr_regs_4k[1] &= 0x0F; if (value.Bit(1)) chr_regs_4k[0] |= 0x10; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs index 31162a326f..35124f4fd0 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC2_4.cs @@ -152,7 +152,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES IrqSignal = (irq_pending && irq_enabled); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { fix_chr = (b) => b; switch (Cart.board_type) @@ -351,10 +351,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES case 0x1001: //$9001 switch (value & (type - 1)) // VRC2 only supports V, H, and not A, B { - case 0: SetMirrorType(NesBoardBase.EMirrorType.Vertical); break; - case 1: SetMirrorType(NesBoardBase.EMirrorType.Horizontal); break; - case 2: SetMirrorType(NesBoardBase.EMirrorType.OneScreenA); break; - case 3: SetMirrorType(NesBoardBase.EMirrorType.OneScreenB); break; + case 0: SetMirrorType(EMirrorType.Vertical); break; + case 1: SetMirrorType(EMirrorType.Horizontal); break; + case 2: SetMirrorType(EMirrorType.OneScreenA); break; + case 3: SetMirrorType(EMirrorType.OneScreenB); break; } break; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs index 98c7dbdc7f..7176636edc 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC3.cs @@ -37,7 +37,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES IrqSignal = (irq_pending && irq_enabled); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs index 3ce0b74f9c..8ea440a9fa 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC6.cs @@ -163,7 +163,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES IrqSignal = (irq_pending && irq_enabled); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs index 155d425c1f..05dada4603 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC7.cs @@ -78,7 +78,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES } } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VS_M99.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VS_M99.cs index 299cda6198..b03a233c1f 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VS_M99.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VS_M99.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES //let's make the extra space here, instead of in the main NES to avoid confusion byte[] CIRAM_VS = new byte[0x800]; - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { //configure switch (Cart.board_type) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/inlnsf.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/inlnsf.cs index ba51043813..8d514930ad 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/inlnsf.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/inlnsf.cs @@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES ser.Sync(nameof(prg), ref prg, true); } - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { switch (Cart.board_type) { diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs index 5a9c33e280..b1a3893caa 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/FDS/FDS.cs @@ -118,7 +118,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public byte[] GetDiskImage() => diskimage; // as we have [INESBoardImplCancel], this will only be called with an fds disk image - public override bool Configure(NES.EDetectionOrigin origin) + public override bool Configure(EDetectionOrigin origin) { if (biosrom == null || biosrom.Length != 8192) throw new MissingFirmwareException("FDS bios image needed!"); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs index e3cd0c9694..1d1fb6856e 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs @@ -288,11 +288,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public string GameName => game_name; - public enum EDetectionOrigin - { - None, BootGodDB, GameDB, INES, UNIF, FDS, NSF - } - StringWriter LoadReport; void LoadWriteLine(string format, params object[] arg) {