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

GBHawk: Bug Fixes, fix to Beast fighter

This commit is contained in:
alyosha-tas 2018-03-29 09:26:55 -04:00
parent 75f380428f
commit c829534170
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
View File

@ -372,6 +372,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
window_y_tile = 0;
window_y_tile_inc = 0;
window_started = false;
window_is_reset = true;
}
Core.cpu.LY = LY;
@ -632,7 +633,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
evaled_sprites = 0;
window_pre_render = false;
if (window_started && LCDC.Bit(5))
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && LCDC.Bit(5)) || (window_is_reset && !LCDC.Bit(5) && (LY > window_y)))
{
window_y_tile_inc++;
if (window_y_tile_inc==8)
@ -682,6 +685,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
window_tile_inc = 0;
window_started = true;
window_is_reset = false;
}
if (!pre_render && !fetch_sprite && !window_pre_render)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ISettable.cs
View File

@ -119,7 +119,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
[JsonIgnore]
private int _RTCInitialTime;
[JsonIgnore]
private ushort _DivInitialTime;
public ushort _DivInitialTime;
public GBSyncSettings Clone()

7
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
View File

@ -146,6 +146,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
window_y_tile = 0;
window_y_tile_inc = 0;
window_started = false;
window_is_reset = true;
}
Core.cpu.LY = LY;
@ -406,7 +407,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
evaled_sprites = 0;
window_pre_render = false;
if (window_started && LCDC.Bit(5))
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && LCDC.Bit(5)) || (window_is_reset && !LCDC.Bit(5) && (LY > window_y)))
{
window_y_tile_inc++;
if (window_y_tile_inc==8)
@ -456,6 +459,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
window_tile_inc = 0;
window_started = true;
window_is_reset = false;
}
if (!pre_render && !fetch_sprite && !window_pre_render)
@ -1146,6 +1150,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
window_counter = 0;
window_pre_render = false;
window_started = false;
window_is_reset = true;
window_tile_inc = 0;
window_y_tile = 0;
window_x_tile = 0;

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
View File

@ -96,6 +96,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public int window_counter;
public bool window_pre_render;
public bool window_started;
public bool window_is_reset;
public int window_tile_inc;
public int window_y_tile;
public int window_x_tile;
@ -243,6 +244,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync("window_counter", ref window_counter);
ser.Sync("window_pre_render", ref window_pre_render);
ser.Sync("window_started", ref window_started);
ser.Sync("window_is_reset", ref window_is_reset);
ser.Sync("window_tile_inc", ref window_tile_inc);
ser.Sync("window_y_tile", ref window_y_tile);
ser.Sync("window_x_tile", ref window_x_tile);

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Timer.cs
View File

@ -144,7 +144,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public void Reset()
{
divider_reg = 0;
divider_reg = Core._syncSettings._DivInitialTime;
timer_reload = 0;
timer = 0;
timer_old = 0;