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

- Reverted thoduv's changes to the 2D core, as they made Mario 64 DS crash due to memory corruption (exact crash was when Peach fades after it's letter to Mario) 

- Fixed a bit the combo boxes on the config button screen,whenever I can I'll fix the zillion others that are wrong
This commit is contained in:
shashclp 2007-10-28 16:21:53 +00:00
parent e7f4ddc9a3
commit b2325ba770
2 changed files with 1176 additions and 1014 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desmume/src/GPU.c
View File

@ -952,24 +952,10 @@ INLINE void renderline_textBG(const GPU * gpu, u8 num, u8 * dst, u32 Y, u16 XBG,
if(tileentry.bits.HFlip) if(tileentry.bits.HFlip)
{ {
u8 currLine;
line += (3 - ((xoff&7)>>1)); line += (3 - ((xoff&7)>>1));
if((!(7 - (xoff & 7)) & 1))
{
currLine = *line;
if (currLine&0xF)
{
color = T1ReadWord(pal, ((currLine&0xF) + tilePalette) << 1);
gpu->setFinalColor(gpu,0,num,dst,color,x,Y);
}
dst += 2; x++; xoff++;
line--;
}
for(; x < xfin; line --) for(; x < xfin; line --)
{ {
currLine = *line; u8 currLine = *line;
if (currLine>>4) if (currLine>>4)
{ {
@ -986,24 +972,10 @@ INLINE void renderline_textBG(const GPU * gpu, u8 num, u8 * dst, u32 Y, u16 XBG,
dst += 2; x++; xoff++; dst += 2; x++; xoff++;
} }
} else { } else {
u8 currLine;
line += ((xoff&7)>>1); line += ((xoff&7)>>1);
if(xoff & 1)
{
currLine = *line;
if (currLine>>4)
{
color = T1ReadWord(pal, ((currLine>>4) + tilePalette) << 1);
gpu->setFinalColor(gpu,0,num,dst,color,x,Y);
}
dst += 2; x++; xoff++;
line++;
}
for(; x < xfin; line ++) for(; x < xfin; line ++)
{ {
currLine = *line; u8 currLine = *line;
if (currLine&0xF) if (currLine&0xF)
{ {

2162
desmume/src/windows/resources.rc
View File

File diff suppressed because it is too large Load Diff