1 files changed, 7 insertions, 0 deletions

diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index b4884d9d9..038d3bffa 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -232,6 +232,13 @@ u8 Read8(const u32 addr) {
 u16 Read16(const u32 addr) {
     u16_le data = 0;
     Read<u16_le>(data, addr);
+
+    // Check for 16-bit unaligned memory reads...
+    if (addr & 1) {
+        // TODO(bunnei): Implement 16-bit unaligned memory reads
+        ERROR_LOG(MEMMAP, "16-bit unaligned memory reads are not implemented!");
+    }
+
     return (u16)data;
 }