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

GBHawk: Pass sprite tests

This commit is contained in:
alyosha-tas 2018-12-15 13:05:01 -06:00
parent afebde0d3e
commit 6fb626386b
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -661,6 +661,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
fetch_sprite = false;
going_to_fetch = false;
first_fetch = true;
consecutive_sprite = -render_offset + 8;
no_sprites = false;
evaled_sprites = 0;
window_pre_render = false;
@ -1155,21 +1156,29 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
// x scroll offsets the penalty table
// 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 % 8) == 0) { sprite_fetch_counter += 5; }
else if ((last_eval % 8) == 1) { sprite_fetch_counter += 4; }
else if ((last_eval % 8) == 2) { sprite_fetch_counter += 3; }
else if ((last_eval % 8) == 3) { sprite_fetch_counter += 2; }
else if ((last_eval % 8) == 4) { sprite_fetch_counter += 1; }
else if ((last_eval % 8) == 5) { sprite_fetch_counter += 0; }
else if ((last_eval % 8) == 6) { sprite_fetch_counter += 0; }
else if ((last_eval % 8) == 7) { sprite_fetch_counter += 0; }
if (((last_eval + render_offset) % 8) == 0) { sprite_fetch_counter += 5; }
else if (((last_eval + render_offset) % 8) == 1) { sprite_fetch_counter += 4; }
else if (((last_eval + render_offset) % 8) == 2) { sprite_fetch_counter += 3; }
else if (((last_eval + render_offset) % 8) == 3) { sprite_fetch_counter += 2; }
else if (((last_eval + render_offset) % 8) == 4) { sprite_fetch_counter += 1; }
else if (((last_eval + render_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + render_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + render_offset) % 8) == 7) { sprite_fetch_counter += 0; }
consecutive_sprite = (int)Math.Floor((double)(last_eval + render_offset) / 8) * 8 + 8 - render_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 && render_offset != 0)
{
sprite_fetch_counter += render_offset;
}
}
total_counter += sprite_fetch_counter;
consecutive_sprite = last_eval + (8 - (last_eval % 8));
first_fetch = false;
}

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

@ -75,13 +75,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
//if (!STAT.Bit(6)) { LYC_INT = false; }
if (!STAT.Bit(4)) { VBL_INT = false; }
break;
break;
case 0xFF42: // SCY
scroll_y = value;
break;
break;
case 0xFF43: // SCX
scroll_x = value;
break;
break;
case 0xFF44: // LY
LY = 0; /*reset*/
break;
@ -455,6 +455,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
fetch_sprite = false;
going_to_fetch = false;
first_fetch = true;
consecutive_sprite = -render_offset + 8;
no_sprites = false;
evaled_sprites = 0;
window_pre_render = false;
@ -852,8 +853,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_data_latch[0] = tile_data[0];
tile_data_latch[1] = tile_data[1];
}
if (consecutive_sprite > 0) { consecutive_sprite -= 1; }
}
// every in range sprite takes 6 cycles to process
@ -892,10 +891,17 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
else if (((last_eval + render_offset) % 8) == 5) { sprite_fetch_counter += 0; }
else if (((last_eval + render_offset) % 8) == 6) { sprite_fetch_counter += 0; }
else if (((last_eval + render_offset) % 8) == 7) { sprite_fetch_counter += 0; }
consecutive_sprite = (int)Math.Floor((double)(last_eval + render_offset) / 8) * 8 + 8 - render_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 && render_offset != 0)
{
sprite_fetch_counter += render_offset;
}
}
total_counter += sprite_fetch_counter;
consecutive_sprite = last_eval + (8 - (last_eval % 8));
first_fetch = false;
}