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

this is not how sprite priorities work, you derp

This commit is contained in:
StapleButter 2017-02-01 18:47:13 +01:00
parent 03c1a9cbc8
commit e028973caa
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GPU2D.cpp
View File

@ -198,24 +198,26 @@ void GPU2D::DrawScanline_Mode1(u32 line, u16* dst)
{ {
if ((BGCnt[3] & 0x3) == i) if ((BGCnt[3] & 0x3) == i)
{ {
if (DispCnt & 0x0800) DrawBG_Text(line, dst, 3); if (DispCnt & 0x0800)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x38000, dst); DrawBG_Text(line, dst, 3);
} }
if ((BGCnt[2] & 0x3) == i) if ((BGCnt[2] & 0x3) == i)
{ {
if (DispCnt & 0x0400) DrawBG_Text(line, dst, 2); if (DispCnt & 0x0400)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x28000, dst); DrawBG_Text(line, dst, 2);
} }
if ((BGCnt[1] & 0x3) == i) if ((BGCnt[1] & 0x3) == i)
{ {
if (DispCnt & 0x0200) DrawBG_Text(line, dst, 1); if (DispCnt & 0x0200)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x18000, dst); DrawBG_Text(line, dst, 1);
} }
if ((BGCnt[0] & 0x3) == i) if ((BGCnt[0] & 0x3) == i)
{ {
if (DispCnt & 0x0100) DrawBG_Text(line, dst, 0); if (DispCnt & 0x0100)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x08000, dst); DrawBG_Text(line, dst, 0);
} }
if (DispCnt & 0x1000)
InterleaveSprites(spritebuf, 0x8000 | (i<<16), dst);
} }
break; break;
@ -224,24 +226,26 @@ void GPU2D::DrawScanline_Mode1(u32 line, u16* dst)
{ {
if ((BGCnt[3] & 0x3) == i) if ((BGCnt[3] & 0x3) == i)
{ {
// ext. todo //if (DispCnt & 0x0800)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x38000, dst); // ext todo
} }
if ((BGCnt[2] & 0x3) == i) if ((BGCnt[2] & 0x3) == i)
{ {
// ext. todo //if (DispCnt & 0x0400)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x28000, dst); // ext todo
} }
if ((BGCnt[1] & 0x3) == i) if ((BGCnt[1] & 0x3) == i)
{ {
if (DispCnt & 0x0200) DrawBG_Text(line, dst, 1); if (DispCnt & 0x0200)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x18000, dst); DrawBG_Text(line, dst, 1);
} }
if ((BGCnt[0] & 0x3) == i) if ((BGCnt[0] & 0x3) == i)
{ {
if (DispCnt & 0x0100) DrawBG_Text(line, dst, 0); if (DispCnt & 0x0100)
if (DispCnt & 0x1000) InterleaveSprites(spritebuf, 0x08000, dst); DrawBG_Text(line, dst, 0);
} }
if (DispCnt & 0x1000)
InterleaveSprites(spritebuf, 0x8000 | (i<<16), dst);
} }
break; break;
} }