From 900c6d0a94849fd01b57f5eb9dc7c0350d5c56cc Mon Sep 17 00:00:00 2001 From: gocha Date: Sun, 26 Aug 2012 03:54:04 +0000 Subject: [PATCH] 0.9.7: Fix ARM9 intrWaitARM_state save/load --- desmume/src/saves.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp index 349f17fd4..b951683e0 100644 --- a/desmume/src/saves.cpp +++ b/desmume/src/saves.cpp @@ -131,7 +131,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 } }; @@ -427,7 +427,7 @@ static bool mmu_loadstate(EMUFILE* is, int size) bool ok = MMU_new.backupDevice.load_state(is); - if(version < 3) return true; + if(version < 3) return ok; ok &= MMU_new.gxstat.loadstate(is); @@ -442,7 +442,7 @@ static bool mmu_loadstate(EMUFILE* is, int size) ok &= MMU_timing.arm9codeCache.loadstate(is, version); ok &= MMU_timing.arm9dataCache.loadstate(is, version); - if(version < 4) return true; + if(version < 4) return ok; ok &= MMU_new.sqrt.loadstate(is,version); ok &= MMU_new.div.loadstate(is,version);