GBHawk: remove DIV offset as a sync setting, leave it always at 8.

This commit is contained in:
alyosha-tas 2020-01-13 09:37:54 -05:00
parent 6ec1ce4d45
commit 2c019794f5
8 changed files with 1 additions and 103 deletions

View File

@ -49,7 +49,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[DefaultValue(PaletteType.BW)]
public PaletteType Palette { get; set; }
public GBSettings Clone()
{
return (GBSettings)MemberwiseClone();
@ -125,21 +124,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
set { _RTCOffset = Math.Max(-127, Math.Min(127, value)); }
}
[DisplayName("Timer Div Initial Time")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime
{
get { return _DivInitialTime; }
set { _DivInitialTime = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Use Existing SaveRAM")]
[Description("When true, existing SaveRAM will be loaded at boot up")]
[DefaultValue(false)]
public bool Use_SRAM { get; set; }
[JsonIgnore]
private int _RTCInitialTime;
[JsonIgnore]
@ -147,7 +136,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[JsonIgnore]
public ushort _DivInitialTime = 8;
public GBSyncSettings Clone()
{
return (GBSyncSettings)MemberwiseClone();

View File

@ -153,7 +153,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public void Reset()
{
divider_reg = Core._syncSettings._DivInitialTime;
divider_reg = 8; // probably always 8 but not confirmed for GB as far as I know
timer_reload = 0;
timer = 0;
timer_old = 0;

View File

@ -137,24 +137,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
set { _RTCOffset_R = Math.Max(-127, Math.Min(127, value)); }
}
[DisplayName("Timer Div Initial Time L")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_L
{
get { return _DivInitialTime_L; }
set { _DivInitialTime_L = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Timer Div Initial Time R")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_R
{
get { return _DivInitialTime_R; }
set { _DivInitialTime_R = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Use Existing SaveRAM")]
[Description("When true, existing SaveRAM will be loaded at boot up")]
[DefaultValue(false)]

View File

@ -52,8 +52,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
temp_sync_L.ConsoleMode = linkSyncSettings.ConsoleMode_L;
temp_sync_R.ConsoleMode = linkSyncSettings.ConsoleMode_R;
temp_sync_L.DivInitialTime = linkSyncSettings.DivInitialTime_L;
temp_sync_R.DivInitialTime = linkSyncSettings.DivInitialTime_R;
temp_sync_L.RTCInitialTime = linkSyncSettings.RTCInitialTime_L;
temp_sync_R.RTCInitialTime = linkSyncSettings.RTCInitialTime_R;
temp_sync_L.RTCOffset = linkSyncSettings.RTCOffset_L;

View File

@ -154,33 +154,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
set { _RTCOffset_R = Math.Max(-127, Math.Min(127, value)); }
}
[DisplayName("Timer Div Initial Time L")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_L
{
get { return _DivInitialTime_L; }
set { _DivInitialTime_L = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Timer Div Initial Time C")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_C
{
get { return _DivInitialTime_C; }
set { _DivInitialTime_C = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Timer Div Initial Time R")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_R
{
get { return _DivInitialTime_R; }
set { _DivInitialTime_R = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Use Existing SaveRAM")]
[Description("When true, existing SaveRAM will be loaded at boot up")]
[DefaultValue(false)]

View File

@ -55,9 +55,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
temp_sync_C.ConsoleMode = Link3xSyncSettings.ConsoleMode_C;
temp_sync_R.ConsoleMode = Link3xSyncSettings.ConsoleMode_R;
temp_sync_L.DivInitialTime = Link3xSyncSettings.DivInitialTime_L;
temp_sync_C.DivInitialTime = Link3xSyncSettings.DivInitialTime_C;
temp_sync_R.DivInitialTime = Link3xSyncSettings.DivInitialTime_R;
temp_sync_L.RTCInitialTime = Link3xSyncSettings.RTCInitialTime_L;
temp_sync_C.RTCInitialTime = Link3xSyncSettings.RTCInitialTime_C;
temp_sync_R.RTCInitialTime = Link3xSyncSettings.RTCInitialTime_R;

View File

@ -183,42 +183,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
set { _RTCOffset_D = Math.Max(-127, Math.Min(127, value)); }
}
[DisplayName("Timer Div Initial Time A")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_A
{
get { return _DivInitialTime_A; }
set { _DivInitialTime_A = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Timer Div Initial Time B")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_B
{
get { return _DivInitialTime_B; }
set { _DivInitialTime_B = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Timer Div Initial Time C")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_C
{
get { return _DivInitialTime_C; }
set { _DivInitialTime_C = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Timer Div Initial Time D")]
[Description("Don't change from 0 unless it's hardware accurate. GBA GBC mode is known to be 8.")]
[DefaultValue(8)]
public int DivInitialTime_D
{
get { return _DivInitialTime_D; }
set { _DivInitialTime_D = Math.Min((ushort)65535, (ushort)value); }
}
[DisplayName("Use Existing SaveRAM")]
[Description("When true, existing SaveRAM will be loaded at boot up")]
[DefaultValue(false)]

View File

@ -60,10 +60,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x
temp_sync_C.ConsoleMode = Link4xSyncSettings.ConsoleMode_C;
temp_sync_D.ConsoleMode = Link4xSyncSettings.ConsoleMode_D;
temp_sync_A.DivInitialTime = Link4xSyncSettings.DivInitialTime_A;
temp_sync_B.DivInitialTime = Link4xSyncSettings.DivInitialTime_B;
temp_sync_C.DivInitialTime = Link4xSyncSettings.DivInitialTime_C;
temp_sync_D.DivInitialTime = Link4xSyncSettings.DivInitialTime_D;
temp_sync_A.RTCInitialTime = Link4xSyncSettings.RTCInitialTime_A;
temp_sync_B.RTCInitialTime = Link4xSyncSettings.RTCInitialTime_B;
temp_sync_C.RTCInitialTime = Link4xSyncSettings.RTCInitialTime_C;