From 0eb9ac777770beac7bec8fe8f324afe4411c9af1 Mon Sep 17 00:00:00 2001 From: Techjar Date: Mon, 3 Sep 2018 17:10:22 -0400 Subject: [PATCH] Include SRAM in savestates This fixes an issue with saving after loading a savestate in Pokemon Colosseum. --- Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp | 2 +- Source/Core/Core/State.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp index 302b6f3ab6..809f5e6531 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp +++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp @@ -151,7 +151,7 @@ CEXIIPL::~CEXIIPL() } void CEXIIPL::DoState(PointerWrap& p) { - p.Do(g_SRAM.rtc); + p.Do(g_SRAM); p.Do(g_rtc_flags); p.Do(m_command); p.Do(m_command_bytes_received); diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp index b12a5f1462..1a2b74c00b 100644 --- a/Source/Core/Core/State.cpp +++ b/Source/Core/Core/State.cpp @@ -74,7 +74,7 @@ static Common::Event g_compressAndDumpStateSyncEvent; static std::thread g_save_thread; // Don't forget to increase this after doing changes on the savestate system -constexpr u32 STATE_VERSION = 116; // Last changed in PR 8879 +constexpr u32 STATE_VERSION = 117; // Last changed in PR 7396 // Maps savestate versions to Dolphin versions. // Versions after 42 don't need to be added to this list,