GBA Savedata: Fix size of SRAM saves (fixes #883)

mgba-emu · Sep 23, 2017 · 5dfa036fa529b3a49eb2c0d391b6d23590363c6a · 5dfa036
1 parent 9a9aba8
commit 5dfa036fa529b3a49eb2c0d391b6d23590363c6a
Unified Split

Showing with 3 additions and 2 deletions.

+1 −0 CHANGES

+1 −1 include/mgba/internal/gba/memory.h

+1 −1 src/gba/cheats.c
diff --git a/CHANGES b/CHANGES
@@ -42,6 +42,7 @@ Bugfixes:
  - GBA: Fix keypad IRQs not firing when extra buttons are pressed
  - GBA Video: Fix broken sprite blending hack (fixes mgba.io/i/532)
  - GBA I/O: Fix reading from a few invalid I/O registers (fixes mgba.io/i/876)
+ - GBA Savedata: Fix size of SRAM saves (fixes mgba.io/i/883)
 Misc:
  - GBA Timer: Use global cycles for timers
  - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
diff --git a/include/mgba/internal/gba/memory.h b/include/mgba/internal/gba/memory.h
@@ -64,7 +64,7 @@ enum {
 	SIZE_CART0 = 0x02000000,
 	SIZE_CART1 = 0x02000000,
 	SIZE_CART2 = 0x02000000,
-	SIZE_CART_SRAM = 0x00010000,
+	SIZE_CART_SRAM = 0x00008000,
 	SIZE_CART_FLASH512 = 0x00010000,
 	SIZE_CART_FLASH1M = 0x00020000,
 	SIZE_CART_EEPROM = 0x00002000,
diff --git a/src/gba/cheats.c b/src/gba/cheats.c
@@ -367,7 +367,7 @@ int GBACheatAddressIsReal(uint32_t address) {
 		return -0x8;
 	case REGION_CART_SRAM:
 	case REGION_CART_SRAM_MIRROR:
-		if ((address & OFFSET_MASK) > SIZE_CART_SRAM) {
+		if ((address & OFFSET_MASK) > SIZE_CART_FLASH512) {
 			return -0x80;
 		}
 		return -0x8;