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

GBHawk: some window clean up and pass new scroll + sprite tests

This commit is contained in:
alyosha-tas 2020-10-05 16:30:07 -04:00
parent af5dfc454c
commit a52c2e79aa
3 changed files with 74 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -783,17 +783,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
total_counter = 0; total_counter = 0;
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y_latch)))
{
window_y_tile_inc++;
if (window_y_tile_inc==8)
{
window_y_tile_inc = 0;
window_y_tile++;
window_y_tile %= 32;
}
}
window_started = false; window_started = false;
if (SL_sprites_index == 0) { no_sprites = true; } if (SL_sprites_index == 0) { no_sprites = true; }
@ -819,13 +808,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
// if the window starts at zero, we still do the first access to the BG // if the window starts at zero, we still do the first access to the BG
// but then restart all over again at the window // but then restart all over again at the window
if ((scroll_offset % 7) <= 6) if ((scroll_offset % 8) == 0)
{ {
read_case = 9; read_case = 4;
} }
else else
{ {
read_case = 10; read_case = 9;
} }
} }
else else
@ -1128,7 +1117,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
case 4: // read from window data case 4: // read from window data
if ((window_counter % 2) == 1) if ((window_counter % 2) == 1)
{ {
temp_fetch = window_y_tile * 32 + (window_x_tile + window_tile_inc) % 32; temp_fetch = window_y_tile * 32 + (window_x_tile + window_tile_inc) % 32;
tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch]; tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch];
@ -1277,6 +1266,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
STAT |= 0x00; STAT |= 0x00;
if (STAT.Bit(3)) { HBL_INT = true; } if (STAT.Bit(3)) { HBL_INT = true; }
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y_latch)))
{
window_y_tile_inc++;
if (window_y_tile_inc == 8)
{
window_y_tile_inc = 0;
window_y_tile++;
window_y_tile %= 32;
}
}
} }
} }
break; break;
@ -1360,9 +1361,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset; consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset;
// special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it. // special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it.
if (last_eval == 0 && scroll_offset != 0) if (last_eval == 0)
{ {
sprite_fetch_counter += scroll_offset; if (scroll_offset <= 5)
{
sprite_fetch_counter += scroll_offset;
}
else
{
sprite_fetch_counter += 5;
}
} }
} }

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

@ -774,17 +774,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
total_counter = 0; total_counter = 0;
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y_latch)))
{
window_y_tile_inc++;
if (window_y_tile_inc==8)
{
window_y_tile_inc = 0;
window_y_tile++;
window_y_tile %= 32;
}
}
window_started = false; window_started = false;
if (SL_sprites_index == 0) { no_sprites = true; } if (SL_sprites_index == 0) { no_sprites = true; }
@ -813,13 +802,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
// if the window starts at zero, we still do the first access to the BG // if the window starts at zero, we still do the first access to the BG
// but then restart all over again at the window // but then restart all over again at the window
if ((scroll_offset % 7) <= 6) if ((scroll_offset % 8) == 0)
{ {
read_case = 9; read_case = 4;
} }
else else
{ {
read_case = 10; read_case = 9;
} }
} }
else else
@ -1243,6 +1232,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (STAT.Bit(3)) { HBL_INT = true; } if (STAT.Bit(3)) { HBL_INT = true; }
// the CPU has to be able to see the transition from mode 3 to mode 0 to start HDMA // the CPU has to be able to see the transition from mode 3 to mode 0 to start HDMA
} }
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y_latch)))
{
window_y_tile_inc++;
if (window_y_tile_inc == 8)
{
window_y_tile_inc = 0;
window_y_tile++;
window_y_tile %= 32;
}
}
} }
} }
break; break;
@ -1326,9 +1327,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset; consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset;
// special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it. // special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it.
if (last_eval == 0 && scroll_offset != 0) if (last_eval == 0)
{ {
sprite_fetch_counter += scroll_offset; if (scroll_offset <= 5)
{
sprite_fetch_counter += scroll_offset;
}
else
{
sprite_fetch_counter += 5;
}
} }
} }

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

@ -464,17 +464,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
total_counter = 0; total_counter = 0;
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y_latch)))
{
window_y_tile_inc++;
if (window_y_tile_inc==8)
{
window_y_tile_inc = 0;
window_y_tile++;
window_y_tile %= 32;
}
}
window_started = false; window_started = false;
if (SL_sprites_index == 0) { no_sprites = true; } if (SL_sprites_index == 0) { no_sprites = true; }
@ -496,17 +485,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
Console.Write(" "); Console.Write(" ");
Console.WriteLine(pixel_counter); Console.WriteLine(pixel_counter);
*/ */
if (window_x_latch == 0) if (window_x_latch == 0)
{ {
// if the window starts at zero, we still do the first access to the BG // if the window starts at zero, we still do the first access to the BG
// but then restart all over again at the window // but then restart all over again at the window
if ((scroll_offset % 7) <= 6) if ((scroll_offset % 8) == 0)
{ {
read_case = 9; read_case = 4;
} }
else else
{ {
read_case = 10; read_case = 9;
} }
} }
else else
@ -879,6 +869,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
STAT |= 0x00; STAT |= 0x00;
if (STAT.Bit(3)) { HBL_INT = true; } if (STAT.Bit(3)) { HBL_INT = true; }
// TODO: If Window is turned on midscanline what happens? When is this check done exactly?
if ((window_started && window_latch) || (window_is_reset && !window_latch && (LY > window_y_latch)))
{
window_y_tile_inc++;
if (window_y_tile_inc == 8)
{
window_y_tile_inc = 0;
window_y_tile++;
window_y_tile %= 32;
}
}
} }
} }
break; break;
@ -954,9 +956,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset; consecutive_sprite = (int)Math.Floor((double)(last_eval + scroll_offset) / 8) * 8 + 8 - scroll_offset;
// special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it. // special case exists here for sprites at zero with non-zero x-scroll. Not sure exactly the reason for it.
if (last_eval == 0 && scroll_offset != 0) if (last_eval == 0)
{ {
sprite_fetch_counter += scroll_offset; if (scroll_offset <= 5)
{
sprite_fetch_counter += scroll_offset;
}
else
{
sprite_fetch_counter += 5;
}
} }
} }