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

[NES] dont break sprite hits when user disables OBJ display

This commit is contained in:
zeromus 2011-06-12 21:55:59 +00:00
parent 0894a20e4c
commit ed5c639f9b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
int rasterpos = xstart; int rasterpos = xstart;
//check all the conditions that can cause things to render in these 8px //check all the conditions that can cause things to render in these 8px
bool renderspritenow = reg_2001.show_obj && (xt > 0 || reg_2001.show_obj_leftmost) && nes.CoreInputComm.NES_ShowOBJ; bool renderspritenow = reg_2001.show_obj && (xt > 0 || reg_2001.show_obj_leftmost);
bool renderbgnow = reg_2001.show_bg && (xt > 0 || reg_2001.show_bg_leftmost) && nes.CoreInputComm.NES_ShowBG; bool renderbgnow = reg_2001.show_bg && (xt > 0 || reg_2001.show_bg_leftmost) && nes.CoreInputComm.NES_ShowBG;
for (int xp = 0; xp < 8; xp++, rasterpos++) for (int xp = 0; xp < 8; xp++, rasterpos++)
@ -236,7 +236,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
} }
} }
if (drawsprite) if (drawsprite && nes.CoreInputComm.NES_ShowOBJ)
{ {
//bring in the palette bits and palettize //bring in the palette bits and palettize
spixel |= (oam->oam[2] & 3) << 2; spixel |= (oam->oam[2] & 3) << 2;