From 588135d4aae75bb35f6dba1aeb4ec19b74b36509 Mon Sep 17 00:00:00 2001
From: Alcaro <floating@muncher.se>
Date: Fri, 30 May 2014 12:12:00 +0200
Subject: [PATCH] This one doesn't really look right.

---
 memmap.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/memmap.cpp b/memmap.cpp
index 911c6182..771dd06e 100644
--- a/memmap.cpp
+++ b/memmap.cpp
@@ -2816,9 +2816,10 @@ void CMemory::map_hirom (uint32 bank_s, uint32 bank_e, uint32 addr_s, uint32 add
 		struct retro_memory_descriptor desc = {0};
 		desc.flags=RETRO_MEMDESC_CONST;
 		desc.ptr=ROM;
+		desc.offset=map_mirror(size, bank_s<<16 | addr_s);
 		desc.start=bank_s<<16 | addr_s;
 		desc.select=(bank_s<<16 | addr_s) ^ (bank_e<<16 | addr_e) ^ 0xFFFFFF;
-		desc.len=size;
+		desc.len=size - desc.offset;
 		S9xAppendMapping(&desc);
 	}
 #endif
@@ -2877,7 +2878,7 @@ void CMemory::map_hirom_offset (uint32 bank_s, uint32 bank_e, uint32 addr_s, uin
 		struct retro_memory_descriptor desc = {0};
 		desc.flags=RETRO_MEMDESC_CONST;
 		desc.ptr=ROM;
-		desc.offset=offset;
+		desc.offset=map_mirror(size, offset + (bank_s<<16 | addr_s));
 		desc.start=bank_s<<16 | addr_s;
 		desc.select=(bank_s<<16 | addr_s) ^ (bank_e<<16 | addr_e) ^ 0xFFFFFF;
 		desc.len=size;