diff options
| author | Arisotura <thetotalworm@gmail.com> | 2019-09-05 11:49:22 +0200 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2019-09-05 11:49:22 +0200 |
| commit | 1aaf0c33cef521b86b72110e82ba6ef7ac0581dd (patch) | |
| tree | 2e7a4469c2d6593ccd83e32cf3a3fd0f3799ea63 | |
| parent | 0010e296bd6d5e12c93791c7481bc04430a58ab5 (diff) | |
guess who the idiot is who broke sprite extpal
| -rw-r--r-- | src/GPU2D.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/GPU2D.cpp b/src/GPU2D.cpp index ef9be41..9297643 100644 --- a/src/GPU2D.cpp +++ b/src/GPU2D.cpp @@ -2463,7 +2463,10 @@ void GPU2D::DrawSprite_Rotscale(u16* attrib, u16* rotparams, u32 boundwidth, u32 if (!window) { - if (!(DispCnt & 0x80000000)) pixelattr |= 0x1000; + if (!(DispCnt & 0x80000000)) + pixelattr |= 0x1000; + else + pixelattr |= ((attrib[2] & 0xF000) >> 4); } if (xmos && !(attrib[0]&0x0200)) @@ -2716,7 +2719,10 @@ void GPU2D::DrawSprite_Normal(u16* attrib, u32 width, s32 xpos, s32 ypos) 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 |