From f9d9257c57c1acc18ad3e8934f8296bd24edc785 Mon Sep 17 00:00:00 2001 From: skidau Date: Sun, 19 Oct 2014 21:25:43 +1100 Subject: [PATCH] Fixed typo in the MEM2 handling. --- Source/Core/Core/HW/MemmapFunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/MemmapFunctions.cpp b/Source/Core/Core/HW/MemmapFunctions.cpp index 9b6079b0ef..d893bbc027 100644 --- a/Source/Core/Core/HW/MemmapFunctions.cpp +++ b/Source/Core/Core/HW/MemmapFunctions.cpp @@ -154,7 +154,7 @@ inline void ReadFromHardware(T &_var, const u32 em_address, const u32 effective_ if (m_pEXRAM && (tlb_addr & 0xF0000000) == 0x10000000) { _var <<= 8; - _var = m_pEXRAM[tlb_addr & EXRAM_MASK]; + _var |= m_pEXRAM[tlb_addr & EXRAM_MASK]; } else {