From 0f70aa87c0c56683362ba78e74bd751cfc6d5cdb Mon Sep 17 00:00:00 2001 From: gocha Date: Sun, 26 Aug 2012 03:53:30 +0000 Subject: [PATCH] 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) --- desmume/src/saves.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp index a54590245..513a09055 100644 --- a/desmume/src/saves.cpp +++ b/desmume/src/saves.cpp @@ -132,7 +132,7 @@ SFORMAT SF_ARM9[]={ { "9LDT", 1, 1, &NDS_ARM9.LDTBit}, { "9Wai", 4, 1, &NDS_ARM9.waitIRQ}, { "9hef", 4, 1, &NDS_ARM9.halt_IE_and_IF }, - { "9iws", 1, 1, &NDS_ARM7.intrWaitARM_state }, + { "9iws", 1, 1, &NDS_ARM9.intrWaitARM_state }, { 0 } }; @@ -446,9 +446,8 @@ static bool mmu_loadstate(EMUFILE* is, int size) MMU_new.gxstat.fifo_low = gxFIFO.size <= 127; MMU_new.gxstat.fifo_empty = gxFIFO.size == 0; - if(version < 5) return ok; - - MMU.reg_DISP3DCNT_bits = T1ReadWord(MMU.ARM9_REG,0x60); + if(version < 5) + MMU.reg_DISP3DCNT_bits = T1ReadWord(MMU.ARM9_REG,0x60); if(version < 6) return ok;