From fae1de846aa224ac8e5f823a4af33e03e855ac15 Mon Sep 17 00:00:00 2001 From: zilmar Date: Tue, 31 May 2022 23:13:19 +0930 Subject: [PATCH] Core: Fix audio issue with save states --- .../N64System/MemoryHandler/AudioInterfaceHandler.cpp | 2 +- Source/Project64-core/N64System/N64System.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Project64-core/N64System/MemoryHandler/AudioInterfaceHandler.cpp b/Source/Project64-core/N64System/MemoryHandler/AudioInterfaceHandler.cpp index 976967a9c..7eb2fcaeb 100644 --- a/Source/Project64-core/N64System/MemoryHandler/AudioInterfaceHandler.cpp +++ b/Source/Project64-core/N64System/MemoryHandler/AudioInterfaceHandler.cpp @@ -148,7 +148,7 @@ bool AudioInterfaceHandler::Write32(uint32_t Address, uint32_t Value, uint32_t M SetFrequency(AI_DACRATE_REG, m_System.SystemType()); } break; - case 0x04500014: AI_DACRATE_REG = (AI_BITRATE_REG & ~Mask) | (MaskedValue); break; + case 0x04500014: AI_BITRATE_REG = (AI_BITRATE_REG & ~Mask) | (MaskedValue); break; default: if (HaveDebugger()) { diff --git a/Source/Project64-core/N64System/N64System.cpp b/Source/Project64-core/N64System/N64System.cpp index cbf4b0d55..4b01d5cea 100644 --- a/Source/Project64-core/N64System/N64System.cpp +++ b/Source/Project64-core/N64System/N64System.cpp @@ -2090,7 +2090,8 @@ bool CN64System::LoadState(const char * FileName) Reset(false, true); m_MMU_VM.UnProtectMemory(0x80000000, 0x80000000 + g_Settings->LoadDword(Game_RDRamSize) - 4); - m_MMU_VM.UnProtectMemory(0xA4000000, 0xA4001FFC); + m_MMU_VM.UnProtectMemory(0xA4000000, 0xA4000FFC); + m_MMU_VM.UnProtectMemory(0xA4001000, 0xA4001FFC); g_Settings->SaveDword(Game_RDRamSize, SaveRDRAMSize); unzReadCurrentFile(file, &NextVITimer, sizeof(NextVITimer)); unzReadCurrentFile(file, &m_Reg.m_PROGRAM_COUNTER, sizeof(m_Reg.m_PROGRAM_COUNTER));