all repos — mgba @ baa937b68f85e3710971b7450e0ad32c8d09a697

mGBA Game Boy Advance Emulator

GBA Savedata: Fix size of SRAM saves (fixes #883)
Vicki Pfau vi@endrift.com
Fri, 22 Sep 2017 21:19:07 -0700
commit

baa937b68f85e3710971b7450e0ad32c8d09a697

parent

1414955da0359fc446ed97f72ce089e0e2ed1a1e

3 files changed, 3 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -28,6 +28,7 @@ - SDL: Fix potential race condition when pressing keys (fixes mgba.io/i/872)

- 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: - Qt: Don't rebuild library view if style hasn't changed - SDL: Fix 2.0.5 build on macOS under some circumstances
M include/mgba/internal/gba/memory.hinclude/mgba/internal/gba/memory.h

@@ -64,7 +64,7 @@ SIZE_OAM = 0x00000400,

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,
M src/gba/cheats.csrc/gba/cheats.c

@@ -367,7 +367,7 @@ case REGION_CART2_EX:

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;