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

fix regression in gxfifo 0x00 command handling (fixes galactik and nintendogs:dalmatian)

This commit is contained in:
zeromus 2009-09-22 16:59:33 +00:00
parent ab8f50eae2
commit 3a74300a72
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desmume/src/gfx3d.cpp
View File

@ -114,7 +114,7 @@ public:
//{} //{}
//else //else
{ {
//printf("gxf: sending hack %02X: (dummy=0)\n", commandsPending.front()); //printf("gxf: sending hack %02X: (dummy=0)\n", front().command);
GFX_FIFOsend(front().command,0); GFX_FIFOsend(front().command,0);
} }
hack = true; hack = true;
@ -122,7 +122,7 @@ public:
} }
if(countdown>0) { if(countdown>0) {
//received a parameter //received a parameter
//printf("gxf: sending %02X: %08X\n", commandsPending.front(),val); //printf("gxf: sending %02X: %08X\n", front().command,val);
//if(commandsPending.front() == GFX3D_NOP_NOARG_HACK) //if(commandsPending.front() == GFX3D_NOP_NOARG_HACK)
//{} //{}
//else //else
@ -138,19 +138,17 @@ public:
countdown = front().countdown; countdown = front().countdown;
if(!countdown) { if(!countdown) {
if(front().command != INVALID_COMMAND /*&& commandsPending.front() != GFX3D_NOP_NOARG_HACK*/) { if(front().command != INVALID_COMMAND /*&& commandsPending.front() != GFX3D_NOP_NOARG_HACK*/) {
//printf("[%06d]gxf: sending %02X: (dummy=0)\n", currFrameCounter,commandsPending.front()); //printf("[%06d]gxf: sending %02X: (dummy=0)\n", currFrameCounter,front().command);
GFX_FIFOsend(front().command,0); GFX_FIFOsend(front().command,0);
} }
} }
} }
if(hack) goto decode; if(hack) goto decode;
} else { } else {
//decode a packed command
decode: decode:
//printf("[%05d] gxf: decoding %08X\n",currFrameCounter,val); //printf("[%05d] gxf: decoding %08X\n",currFrameCounter,val);
if(val==0x2D8B62D8) {
int zzz=9;
}
//received a packed command. unpack into commandsPending
bool valid = true; bool valid = true;
bool gimpyCommand = false; bool gimpyCommand = false;
const u8 commands[] = { val&0xFF, (val>>8)&0xFF, (val>>16)&0xFF, (val>>24)&0xFF }; const u8 commands[] = { val&0xFF, (val>>8)&0xFF, (val>>16)&0xFF, (val>>24)&0xFF };
@ -163,10 +161,14 @@ decode:
commandsPending[i].command = INVALID_COMMAND; commandsPending[i].command = INVALID_COMMAND;
} else { } else {
if(type == UNDEFINED_COMMAND) if(type == UNDEFINED_COMMAND)
{
commandsPending[i].command = GFX3D_NOP_NOARG_HACK; //enqueue a single undefined command we know how to handle commandsPending[i].command = GFX3D_NOP_NOARG_HACK; //enqueue a single undefined command we know how to handle
}
else commandsPending[i].command = cmd; else commandsPending[i].command = cmd;
} }
if(type == UNDEFINED_COMMAND || type == 0x00) { if(type == UNDEFINED_COMMAND
//|| type == 0x00 //DON'T DO THIS: galactik football will break if you do (ingame character portraits etc.) as well as nintendogs dalmatian
) {
//these are valid commands with no parameters. they might need special handling //these are valid commands with no parameters. they might need special handling
//as long as there is a subsequent defined command with parameters, we're safe //as long as there is a subsequent defined command with parameters, we're safe
bool safe = false; bool safe = false;