piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-24 22:59:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

guess who the idiot is who broke sprite extpal

Browse Source
This commit is contained in:
Arisotura
2019-09-05 11:49:22 +02:00
parent 0010e296bd
commit 1aaf0c33ce
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/GPU2D.cpp
View File

@ -2463,7 +2463,10 @@ void GPU2D::DrawSprite_Rotscale(u16* attrib, u16* rotparams, u32 boundwidth, u32
if (!window) if (!window)
{ {
if (!(DispCnt & 0x80000000)) pixelattr |= 0x1000; if (!(DispCnt & 0x80000000))
pixelattr |= 0x1000;
else
pixelattr |= ((attrib[2] & 0xF000) >> 4);
} }
if (xmos && !(attrib[0]&0x0200)) if (xmos && !(attrib[0]&0x0200))
@ -2716,7 +2719,10 @@ void GPU2D::DrawSprite_Normal(u16* attrib, u32 width, s32 xpos, s32 ypos)
if (!window) if (!window)
{ {
if (!(DispCnt & 0x80000000)) pixelattr |= 0x1000; if (!(DispCnt & 0x80000000))
pixelattr |= 0x1000;
else
pixelattr |= ((attrib[2] & 0xF000) >> 4);
} }
if (attrib[1] & 0x1000) // xflip. TODO: do better? oh well for now this works if (attrib[1] & 0x1000) // xflip. TODO: do better? oh well for now this works