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

Fix ARM9 intrWaitARM_state save/load 

Revert MMU.reg_DISP3DCNT_bits load (it should be read from MMU.ARM9_REG only if it's old savestate)
This commit is contained in:
gocha 2012-08-26 03:53:30 +00:00
parent 7414084aec
commit 0f70aa87c0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/saves.cpp
View File

@ -132,7 +132,7 @@ SFORMAT SF_ARM9[]={
{ "9LDT", 1, 1, &NDS_ARM9.LDTBit}, { "9LDT", 1, 1, &NDS_ARM9.LDTBit},
{ "9Wai", 4, 1, &NDS_ARM9.waitIRQ}, { "9Wai", 4, 1, &NDS_ARM9.waitIRQ},
{ "9hef", 4, 1, &NDS_ARM9.halt_IE_and_IF }, { "9hef", 4, 1, &NDS_ARM9.halt_IE_and_IF },
{ "9iws", 1, 1, &NDS_ARM7.intrWaitARM_state }, { "9iws", 1, 1, &NDS_ARM9.intrWaitARM_state },
{ 0 } { 0 }
}; };
@ -446,8 +446,7 @@ static bool mmu_loadstate(EMUFILE* is, int size)
MMU_new.gxstat.fifo_low = gxFIFO.size <= 127; MMU_new.gxstat.fifo_low = gxFIFO.size <= 127;
MMU_new.gxstat.fifo_empty = gxFIFO.size == 0; MMU_new.gxstat.fifo_empty = gxFIFO.size == 0;
if(version < 5) return ok; if(version < 5)
MMU.reg_DISP3DCNT_bits = T1ReadWord(MMU.ARM9_REG,0x60); MMU.reg_DISP3DCNT_bits = T1ReadWord(MMU.ARM9_REG,0x60);
if(version < 6) return ok; if(version < 6) return ok;