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

VS DIPs updates 

works good
This commit is contained in:
alyosha-tas 2016-11-03 21:57:47 -04:00 committed by GitHub
parent 3fa2828d5b
commit c9c7415883
2 changed files with 20 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/UxROM.cs
View File

@ -26,23 +26,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
//state
int prg;
[MapperProp]
public byte Dip_Switch_1;
[MapperProp]
public byte Dip_Switch_2;
[MapperProp]
public byte Dip_Switch_3;
[MapperProp]
public byte Dip_Switch_4;
[MapperProp]
public byte Dip_Switch_5;
[MapperProp]
public byte Dip_Switch_6;
[MapperProp]
public byte Dip_Switch_7;
[MapperProp]
public byte Dip_Switch_8;
//the VS actually does have 2 KB of nametable address space
//let's make the extra space here, instead of in the main NES to avoid confusion
byte[] CIRAM_VS = new byte[0x800];
@ -80,7 +63,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
AssertPrg(256); AssertChr(0); AssertVram(8); AssertWram(0);
break;
case "NES-UNROM_VS":
AutoMapperProps.Apply(this);
//update the state of the dip switches
//this is only done at power on
NES.VS_dips[0] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[1] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[2] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[3] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[4] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[5] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[6] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[7] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES._isVS = true;
break;
default:
@ -165,14 +157,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
if (NES.IsVS)
{
ser.Sync("VS_CIRAM", ref CIRAM_VS, false);
ser.Sync("Dip_1", ref Dip_Switch_1);
ser.Sync("Dip_2", ref Dip_Switch_2);
ser.Sync("Dip_3", ref Dip_Switch_3);
ser.Sync("Dip_4", ref Dip_Switch_4);
ser.Sync("Dip_5", ref Dip_Switch_5);
ser.Sync("Dip_6", ref Dip_Switch_6);
ser.Sync("Dip_7", ref Dip_Switch_7);
ser.Sync("Dip_8", ref Dip_Switch_8);
}
}
}

36
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/VRC1.cs
View File

@ -16,23 +16,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
IntBuffer chr_banks_4k = new IntBuffer(2);
int[] chr_regs_4k = new int[2];
[MapperProp]
public byte Dip_Switch_1;
[MapperProp]
public byte Dip_Switch_2;
[MapperProp]
public byte Dip_Switch_3;
[MapperProp]
public byte Dip_Switch_4;
[MapperProp]
public byte Dip_Switch_5;
[MapperProp]
public byte Dip_Switch_6;
[MapperProp]
public byte Dip_Switch_7;
[MapperProp]
public byte Dip_Switch_8;
//the VS actually does have 2 KB of nametable address space
//let's make the extra space here, instead of in the main NES to avoid confusion
byte[] CIRAM_VS = new byte[0x800];
@ -52,14 +35,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
if (NES.IsVS)
{
ser.Sync("VS_CIRAM", ref CIRAM_VS, false);
ser.Sync("Dip_1", ref Dip_Switch_1);
ser.Sync("Dip_2", ref Dip_Switch_2);
ser.Sync("Dip_3", ref Dip_Switch_3);
ser.Sync("Dip_4", ref Dip_Switch_4);
ser.Sync("Dip_5", ref Dip_Switch_5);
ser.Sync("Dip_6", ref Dip_Switch_6);
ser.Sync("Dip_7", ref Dip_Switch_7);
ser.Sync("Dip_8", ref Dip_Switch_8);
}
for (int i = 0; i < 2; i++) ser.Sync("chr_regs_4k_" + i, ref chr_regs_4k[i]);
@ -78,7 +53,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
break;
case "MAPPER075VS":
NES._isVS = true;
AutoMapperProps.Apply(this);
//update the state of the dip switches
//this is only done at power on
NES.VS_dips[0] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[1] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[2] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[3] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[4] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[5] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[6] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
NES.VS_dips[7] = (byte)(NES.SyncSettings.VSDipswitches.Dip_Switch_1 ? 1 : 0);
break;
case "KONAMI-VRC-1":
case "JALECO-JF-20":