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

Fixed a bug I introduced in GPU and made cflash working again 

(using the current directory instead of the rom directory, I
think it should be ok)
This commit is contained in:
yabause 2006-11-04 14:09:36 +00:00
parent 9ba3d19cde
commit e6491a5e0b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trunk/desmume/src/GPU.c
View File

@ -724,7 +724,7 @@ INLINE void rotBG2(GPU * gpu, u8 num, u16 * DST, u16 H, s32 X, s32 Y, s16 PA, s1
u16 * dst = DST; u16 * dst = DST;
u8 mapinfo; u8 mapinfo;
u8 coul; u8 coul;
if((!tile)||(!map)) return; if((!tile)||(!map)) return;
u8 * pal = ARM9Mem.ARM9_VMEM + gpu->core * 0x400; u8 * pal = ARM9Mem.ARM9_VMEM + gpu->core * 0x400;
@ -930,7 +930,7 @@ void sprite1D(GPU * gpu, u16 l, u16 * dst, u8 * prioTab)
u8 block = gpu->sprBlock; u8 block = gpu->sprBlock;
u16 i; u16 i;
for(i = 0; i<nbShow; ++i, --aux) for(i = 0; i<nbShow; ++i, --aux)
{ {
s32 sprX = aux->attr1 & 0x1FF; s32 sprX = aux->attr1 & 0x1FF;
@ -1136,7 +1136,7 @@ void sprite2D(GPU * gpu, u16 l, u16 * dst, u8 * prioTab)
{ {
u16 i; u16 i;
OAM * aux = gpu->oam + (nbShow-1);// + 127; OAM * aux = gpu->oam + (nbShow-1);// + 127;
for(i = 0; i<nbShow; ++i, --aux) for(i = 0; i<nbShow; ++i, --aux)
{ {
s32 sprX = aux->attr1 & 0x1FF; s32 sprX = aux->attr1 & 0x1FF;
@ -1174,14 +1174,15 @@ void sprite2D(GPU * gpu, u16 l, u16 * dst, u8 * prioTab)
if((aux->attr0&(3<<10))==(3<<10)) if((aux->attr0&(3<<10))==(3<<10))
{ {
u8 * src = (gpu->sprMem) +(aux->attr2&0x3E0)*64 + (aux->attr2&0x1F)*8 + (y<<8); u8 * src = (gpu->sprMem) + (((aux->attr2&0x3E0) * 64 + (aux->attr2&0x1F) * 8 + ( y << 8)) << 1);
u16 i; u16 i;
if(aux->attr1&(1<<12)) if(aux->attr1&(1<<12))
{ {
x = sprSize.x -x - 1; x = sprSize.x -x - 1;
for(i = 0; i < lg; ++i, --x, ++sprX) for(i = 0; i < lg; ++i, --x, ++sprX)
{ {
u8 c = src[x]; u8 c = src[x << 1];
if((c>>15) && (prioTab[sprX]>=prio)) if((c>>15) && (prioTab[sprX]>=prio))
{ {
dst[sprX] = c; dst[sprX] = c;

6
trunk/desmume/src/NDSSystem.c
View File

@ -355,11 +355,11 @@ int NDS_LoadROM(const char *filename)
NDS_Reset(); NDS_Reset();
NDS_SetROM(data, mask); NDS_SetROM(data, mask);
/* // Will be added later /* I guess any directory can be used
strcpy(szRomPath, dirname((char *) filename)); * so the current one should be ok */
strcpy(szRomPath, ".");
cflash_close(); cflash_close();
cflash_init(); cflash_init();
*/
return i; return i;
} }