From 270899dbdb264174458963a707b7a323662812f8 Mon Sep 17 00:00:00 2001
From: Silent <zdanio95@gmail.com>
Date: Thu, 23 Sep 2021 20:42:41 +0200
Subject: [PATCH] Make DoSafeMemoryAccess return true properly for RAM, BIOS,
 dcache writes

Fixes broken cheats when writing to unaligned addresses,
maybe also achievements.
---
 src/core/bus.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/core/bus.cpp b/src/core/bus.cpp
index 842ae6994..0d443d7e3 100644
--- a/src/core/bus.cpp
+++ b/src/core/bus.cpp
@@ -1914,7 +1914,10 @@ static ALWAYS_INLINE bool DoSafeMemoryAccess(VirtualMemoryAddress address, u32&
     {
       address &= PHYSICAL_MEMORY_ADDRESS_MASK;
       if ((address & DCACHE_LOCATION_MASK) == DCACHE_LOCATION)
-        return DoScratchpadAccess<type, size>(address, value);
+      {
+        DoScratchpadAccess<type, size>(address, value);
+        return true;
+      }
     }
     break;
 
@@ -1937,16 +1940,18 @@ static ALWAYS_INLINE bool DoSafeMemoryAccess(VirtualMemoryAddress address, u32&
 
   if (address < RAM_MIRROR_END)
   {
-    return DoRAMAccess<type, size, true>(address, value);
+    DoRAMAccess<type, size, true>(address, value);
+    return true;
   }
-  else if (address >= BIOS_BASE && address < (BIOS_BASE + BIOS_SIZE))
+  if constexpr (type == MemoryAccessType::Read)
   {
-    return DoBIOSAccess<type, size>(static_cast<u32>(address - BIOS_BASE), value);
-  }
-  else
-  {
-    return false;
+    if (address >= BIOS_BASE && address < (BIOS_BASE + BIOS_SIZE))
+    {
+      DoBIOSAccess<type, size>(static_cast<u32>(address - BIOS_BASE), value);
+      return true;
+    }
   }
+  return false;
 }
 
 bool SafeReadMemoryByte(VirtualMemoryAddress addr, u8* value)