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

support extended palette for 256-color sprites.

This commit is contained in:
StapleButter 2017-02-05 18:23:03 +01:00
parent e88cf1b43d
commit 1001df49ea
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GPU2D.cpp
View File

@ -824,8 +824,18 @@ void GPU2D::DrawSprite_Normal(u16* attrib, u32 width, s32 xpos, u32 ypos, u32* d
pixels += (tilenum & 0x3FFF);
pixels += ((ypos & 0x7) << 3);
u16* pal = (u16*)&GPU::Palette[Num ? 0x600 : 0x200];
//pal += (attrib[2] & 0xF000) >> 8;
u32 extpal = (DispCnt & 0x80000000);
u16* pal;
if (extpal)
{
pal = (u16*)(Num ? GPU::VRAM_BOBJExtPal : GPU::VRAM_AOBJExtPal);
pal += (attrib[2] & 0xF000) >> 4;
}
else
pal = (u16*)&GPU::Palette[Num ? 0x600 : 0x200];
if (!pal) pal = (u16*)&GPU::Palette[Num ? 0x600 : 0x200]; // derp
if (attrib[1] & 0x1000) // xflip. TODO: do better? oh well for now this works
{

2
melonDS.depend
View File

@ -137,7 +137,7 @@
1485980863 c:\documents\sources\melonds\ndscart.h
"types.h"
1486312231 source:c:\documents\sources\melonds\ndscart.cpp
1486313011 source:c:\documents\sources\melonds\ndscart.cpp
<stdio.h>
<string.h>
"NDS.h"