all repos — mgba @ 16e2aec6df0114eba7b6996d20409c643d004451

mGBA Game Boy Advance Emulator

GBA Memory: Fix Store8 to OBJ VRAM
Jeffrey Pfau jeffrey@endrift.com
Fri, 06 Nov 2015 21:07:29 -0800
commit

16e2aec6df0114eba7b6996d20409c643d004451

parent

647872a8d90feb79deebfc13ccd0c868e99c7e2a

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

jump to
M CHANGESCHANGES

@@ -20,6 +20,7 @@ - Libretro: Fix problems with rumble not turning off

- ARM7: Fix sign of unaligned LDRSH - GBA BIOS: Fix CpuSet on 0x01XXXXXX addresses - GBA Memory: Fix DMA behavior for SRAM accesses + - GBA Memory: Fix Store8 to OBJ VRAM Misc: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M src/gba/memory.csrc/gba/memory.c

@@ -811,7 +811,7 @@ case REGION_PALETTE_RAM:

GBAStore16(cpu, address & ~1, ((uint8_t) value) | ((uint8_t) value << 8), cycleCounter); break; case REGION_VRAM: - if (address >= 0x06018000) { + if ((address & 0x0001FFFF) >= 0x00010000) { // TODO: check BG mode GBALog(gba, GBA_LOG_GAME_ERROR, "Cannot Store8 to OBJ: 0x%08X", address); break;