From 530a48a30c6959d05bdeaee7505c3117a3ac1dce Mon Sep 17 00:00:00 2001
From: Rosalie Wanders <rosalie@mailbox.org>
Date: Fri, 10 Jan 2025 18:36:52 +0100
Subject: [PATCH] 3rdParty: update rom size patch for mupen64plus-core

---
 Source/3rdParty/mupen64plus-core/src/device/cart/cart_rom.h | 2 +-
 Source/3rdParty/mupen64plus-core/src/device/device.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/3rdParty/mupen64plus-core/src/device/cart/cart_rom.h b/Source/3rdParty/mupen64plus-core/src/device/cart/cart_rom.h
index 2bba5a30..4082254e 100644
--- a/Source/3rdParty/mupen64plus-core/src/device/cart/cart_rom.h
+++ b/Source/3rdParty/mupen64plus-core/src/device/cart/cart_rom.h
@@ -43,7 +43,7 @@ struct cart_rom
 
 static osal_inline uint32_t rom_address(uint32_t address)
 {
-    return (address & 0x03fffffc);
+    return (address & 0x0ffffffc);
 }
 
 void init_cart_rom(struct cart_rom* cart_rom,
diff --git a/Source/3rdParty/mupen64plus-core/src/device/device.c b/Source/3rdParty/mupen64plus-core/src/device/device.c
index 2487ef4f..baeebf53 100644
--- a/Source/3rdParty/mupen64plus-core/src/device/device.c
+++ b/Source/3rdParty/mupen64plus-core/src/device/device.c
@@ -156,7 +156,7 @@ void init_device(struct device* dev,
         { A(MM_DD_ROM, 0x1ffffff), M64P_MEM_NOTHING, { NULL, RW(open_bus) } },
         { A(MM_DOM2_ADDR2, 0x1ffff), M64P_MEM_FLASHRAMSTAT, { &dev->cart, RW(cart_dom2)  } },
         { A(MM_IS_VIEWER, 0xfff), M64P_MEM_NOTHING, { &dev->is, RW(is_viewer) } },
-        { A(MM_CART_ROM, min(rom_size-1, 0x3ffffff)), M64P_MEM_ROM, { &dev->cart.cart_rom, RW(cart_rom) } },
+        { A(MM_CART_ROM, min(rom_size-1, 0xfbfffff)), M64P_MEM_ROM, { &dev->cart.cart_rom, RW(cart_rom) } },
         { A(MM_PIF_MEM, 0xffff), M64P_MEM_PIF, { &dev->pif, RW(pif_mem) } }
     };