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

GBHawk: Fix window timing

This commit is contained in:
alyosha-tas 2018-05-15 20:44:20 -04:00
parent 148f6d4332
commit 6f2ae8cbf2
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,17 +825,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
read_case = 8; read_case = 8;
hbl_countdown = 5; hbl_countdown = 5;
if (window_started)
{
hbl_countdown -= 2;
}
}
if (pixel_counter == 158 && window_started)
{
STAT &= 0xFC;
STAT |= 0x00;
if (STAT.Bit(3)) { HBL_INT = true; }
} }
} }
else if ((render_counter >= render_offset) && (pixel_counter < 0)) else if ((render_counter >= render_offset) && (pixel_counter < 0))
@ -1009,10 +998,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
if (!window_pre_render) window_tile_inc++;
{
window_tile_inc++;
}
read_case = 5; read_case = 5;
} }
window_counter++; window_counter++;
@ -1089,10 +1075,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (window_pre_render) if (window_pre_render)
{ {
// here we set up rendering // here we set up rendering
window_pre_render = false; // unlike for the normal background case, there is no pre-render period for the window
// so start shifting in data to the screen right away
render_offset = 0; render_offset = 0;
render_counter = 0; render_counter = 8;
latch_counter = 0; latch_counter = 0;
latch_new_data = true;
window_pre_render = false;
read_case = 4; read_case = 4;
} }
else else

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

@ -701,10 +701,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
else else
{ {
if (!window_pre_render) window_tile_inc++;
{
window_tile_inc++;
}
read_case = 5; read_case = 5;
} }
window_counter++; window_counter++;
@ -770,10 +767,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (window_pre_render) if (window_pre_render)
{ {
// here we set up rendering // here we set up rendering
window_pre_render = false; // unlike for the normal background case, there is no pre-render period for the window
// so start shifting in data to the screen right away
render_offset = 0; render_offset = 0;
render_counter = 0; render_counter = 8;
latch_counter = 0; latch_counter = 0;
latch_new_data = true;
window_pre_render = false;
read_case = 4; read_case = 4;
} }
else else