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

NES: Sprites don't render on scanline 0

This commit is contained in:
alyosha-tas 2018-03-07 09:46:40 -05:00
parent f2a7bdcb6a
commit 9804a0901a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/APU.cs
View File

@ -556,7 +556,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
ser.Sync("linear_counter_reload", ref linear_counter_reload);
ser.Sync("control_flag", ref control_flag);
ser.Sync("timer_cnt", ref timer_cnt);
ser.Sync("halt_flag", ref reload_flag);
ser.Sync("reload_flag", ref reload_flag);
ser.Sync("len_cnt", ref len_cnt);
ser.Sync("lenctr_en", ref lenctr_en);

21
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/PPU.run.cs
View File

@ -745,7 +745,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
// now that we have a sprite, we can fill in the next scnaline's sprite pixels with it
// this saves quite a bit of processing compared to checking each pixel
if (s < soam_index_prev)
if (s < soam_index_prev && (ppur.status.sl != 0) && (ppur.status.sl != 240))
{
int temp_x = t_oam[s].oam_x;
for (int i = 0; (temp_x + i) < 256 && i < 8; i++)
@ -845,18 +845,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
int temp_x = t_oam[s].oam_x;
for (int i = 0; (temp_x + i) < 256 && i < 8; i++)
if ((ppur.status.sl != 0) && (ppur.status.sl != 240))
{
if (sl_sprites[256 + temp_x + i] == 0)
for (int i = 0; (temp_x + i) < 256 && i < 8; i++)
{
if (t_oam[s].patterns_0.Bit(i) || t_oam[s].patterns_1.Bit(i))
if (sl_sprites[256 + temp_x + i] == 0)
{
int spixel = t_oam[s].patterns_0.Bit(i) ? 1 : 0;
spixel |= (t_oam[s].patterns_1.Bit(i) ? 2 : 0);
if (t_oam[s].patterns_0.Bit(i) || t_oam[s].patterns_1.Bit(i))
{
int spixel = t_oam[s].patterns_0.Bit(i) ? 1 : 0;
spixel |= (t_oam[s].patterns_1.Bit(i) ? 2 : 0);
sl_sprites[temp_x + i] = (byte)s;
sl_sprites[256 + temp_x + i] = (byte)spixel;
sl_sprites[512 + temp_x + i] = t_oam[s].oam_attr;
sl_sprites[temp_x + i] = (byte)s;
sl_sprites[256 + temp_x + i] = (byte)spixel;
sl_sprites[512 + temp_x + i] = t_oam[s].oam_attr;
}
}
}
}