ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NesHawk - move some enums out of NesBoardBase, simplifies a lot of usages

This commit is contained in:
adelikat 2020-03-19 20:29:15 -05:00
parent 720a2dce02
commit 620c38af73
235 changed files with 295 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AVE-NINA.cs
View File

@ -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)

15
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/AxROM.cs
View File

@ -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);
}
}
}

10
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI-FCG-1.cs
View File

@ -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:

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_02_74.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BANDAI_74_161_161_32.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Bonza.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/BxROM.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CNROM.cs
View File

@ -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)

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CPROM.cs
View File

@ -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;
}

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Camerica.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CamericaGoldenFive.cs
View File

@ -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)
{

6
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Cony.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/CoolBoy.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/ExROM.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper006.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FFE/Mapper017.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/FS304.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Farid-UNROM-8-in-1.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GameGenie.cs
View File

@ -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)
{

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/GxROM.cs
View File

@ -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");

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IC_74x377.cs
View File

@ -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)
{

7
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/INesBoard.cs
View File

@ -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();

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM-74_161_161_21_138.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/IREM_TAM_S1.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_G101.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Irem_H3001.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_05_06_07.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_13.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_17.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_JF_19.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/JALECO_SS8806.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Jaleco-JF_11_14.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-ACTION52.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MLT-MAX15.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/HKROM.cs
View File

@ -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)

19
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/MMC3.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper012.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper037.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper044.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper049.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper052.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper074.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper114.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper115.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper121.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper123.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper134.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper165.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper182.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper187.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper189.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper191.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper192.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper194.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper195_CW.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper196.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper197.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper198.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper199.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper205.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper208.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper215.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper217.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper219.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper223.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper238.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper245.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper249.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper250.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Mapper254.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/NES-QJ.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/Pocahontas.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/RexSoftSL1632.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TLSROM.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TQROM.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TVROM.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/MMC3_family/TxROM.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper015.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper028.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper029.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper030.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper034.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper036.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper038.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper040.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper041.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper042.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper043.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper045.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper046.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper051.cs
View File

@ -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)
{

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper053.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper057.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper058.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper063.cs
View File

@ -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)
{

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper069.cs
View File

@ -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)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper078.cs
View File

@ -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;

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper090.cs
View File

@ -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)
{

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Mapper091.cs
View File

@ -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)
{

Some files were not shown because too many files have changed in this diff Show More