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

GBHawk: Fix alignment of sprite evaluation when window is activated

This commit is contained in:
alyosha-tas 2020-10-05 23:27:42 -04:00
parent 7d1133ff9c
commit f0508df4ae
4 changed files with 58 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
View File

@ -1096,6 +1096,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// x scroll is latched here, only the lower 3 bits are latched though
render_offset = scroll_offset = scroll_x % 8;
// sprite scroll offset could change depending on window usage
sprite_scroll_offset = scroll_offset;
render_counter = 0;
latch_counter = 0;
read_case = 0;
@ -1216,12 +1219,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
render_counter = 8 - scroll_offset;
render_offset = 7 - window_x_latch;
sprite_scroll_offset = 8 - (window_x_latch + 8 - 7) % 8;
}
else
{
render_offset = 0;
read_case = 4;
render_counter = 8;
sprite_scroll_offset = 8 - (window_x_latch - 7) % 8;
}
latch_counter = 0;
@ -1349,23 +1356,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// there is no penalty if the next sprites to be fetched are within the currentfetch block (8 pixels)
if (first_fetch || (last_eval >= consecutive_sprite))
{
if (((last_eval + scroll_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + scroll_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + scroll_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + scroll_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + scroll_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + scroll_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + scroll_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + scroll_offset) % 8) == 7) { sprite_fetch_counter += 0; }
if (((last_eval + sprite_scroll_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + sprite_scroll_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + sprite_scroll_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + sprite_scroll_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + sprite_scroll_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + sprite_scroll_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + sprite_scroll_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + sprite_scroll_offset) % 8) == 7) { sprite_fetch_counter += 0; }
consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset;
consecutive_sprite = (int)Math.Floor((double)(last_eval + sprite_scroll_offset) / 8) * 8 + 8 - sprite_scroll_offset;
// special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it.
if (last_eval == 0)
{
if (scroll_offset <= 5)
if (sprite_scroll_offset <= 5)
{
sprite_fetch_counter += scroll_offset;
sprite_fetch_counter += sprite_scroll_offset;
}
else
{

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

@ -1051,6 +1051,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// x scroll is latched here, only the lower 3 bits are latched though
render_offset = scroll_offset = scroll_x % 8;
// sprite scroll offset could change depending on window usage
sprite_scroll_offset = scroll_offset;
render_counter = 0;
latch_counter = 0;
read_case = 0;
@ -1170,13 +1173,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
render_counter = 8 - scroll_offset;
render_offset = 7 - window_x_latch;
render_offset = 7 - window_x_latch;
sprite_scroll_offset = 8 - (window_x_latch + 8 - 7) % 8;
}
else
{
render_offset = 0;
read_case = 4;
render_counter = 8;
sprite_scroll_offset = 8 - (window_x_latch - 7) % 8;
}
latch_counter = 0;
@ -1315,23 +1322,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// there is no penalty if the next sprites to be fetched are within the currentfetch block (8 pixels)
if (first_fetch || (last_eval >= consecutive_sprite))
{
if (((last_eval + scroll_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + scroll_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + scroll_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + scroll_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + scroll_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + scroll_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + scroll_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + scroll_offset) % 8) == 7) { sprite_fetch_counter += 0; }
if (((last_eval + sprite_scroll_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + sprite_scroll_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + sprite_scroll_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + sprite_scroll_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + sprite_scroll_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + sprite_scroll_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + sprite_scroll_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + sprite_scroll_offset) % 8) == 7) { sprite_fetch_counter += 0; }
consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset;
consecutive_sprite = (int)Math.Floor((double)(last_eval + sprite_scroll_offset) / 8) * 8 + 8 - sprite_scroll_offset;
// special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it.
if (last_eval == 0)
{
if (scroll_offset <= 5)
if (sprite_scroll_offset <= 5)
{
sprite_fetch_counter += scroll_offset;
sprite_fetch_counter += sprite_scroll_offset;
}
else
{

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

@ -714,6 +714,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// x scroll is latched here
render_offset = scroll_offset = scroll_x % 8;
// sprite scroll offset could change depending on window usage
sprite_scroll_offset = scroll_offset;
render_counter = 0;
latch_counter = 0;
read_case = 0;
@ -819,12 +822,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
render_counter = 8 - scroll_offset;
render_offset = 7 - window_x_latch;
sprite_scroll_offset = 8 - (window_x_latch + 8 - 7) % 8;
}
else
{
render_offset = 0;
read_case = 4;
render_counter = 8;
render_counter = 8;
sprite_scroll_offset = 8 - (window_x_latch - 7) % 8;
}
latch_counter = 0;
@ -944,23 +951,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// there is no penalty if the next sprites to be fetched are within the currentfetch block (8 pixels)
if (first_fetch || (last_eval >= consecutive_sprite))
{
if (((last_eval + scroll_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + scroll_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + scroll_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + scroll_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + scroll_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + scroll_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + scroll_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + scroll_offset) % 8) == 7) { sprite_fetch_counter += 0; }
if (((last_eval + sprite_scroll_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + sprite_scroll_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + sprite_scroll_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + sprite_scroll_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + sprite_scroll_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + sprite_scroll_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + sprite_scroll_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + sprite_scroll_offset) % 8) == 7) { sprite_fetch_counter += 0; }
consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset;
consecutive_sprite = (int)Math.Floor((double)(last_eval + sprite_scroll_offset) / 8) * 8 + 8 - sprite_scroll_offset;
// special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it.
if (last_eval == 0)
{
if (scroll_offset <= 5)
if (sprite_scroll_offset <= 5)
{
sprite_fetch_counter += scroll_offset;
sprite_fetch_counter += sprite_scroll_offset;
}
else
{

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

@ -113,6 +113,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public int window_y_latch;
public int hbl_countdown;
public int sprite_scroll_offset;
public virtual byte ReadReg(int addr)
{
@ -274,6 +275,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(window_y_latch), ref window_y_latch);
ser.Sync(nameof(hbl_countdown), ref hbl_countdown);
ser.Sync(nameof(sprite_scroll_offset), ref sprite_scroll_offset);
}
}
}