all repos — mgba @ 2ea44603a810320af7a90d0dd4bb96116aca239d

mGBA Game Boy Advance Emulator

GBA Memory: Fix bad BIOS Load16 on big endian
Jeffrey Pfau jeffrey@endrift.com
Sun, 04 Oct 2015 21:19:17 -0700
commit

2ea44603a810320af7a90d0dd4bb96116aca239d

parent

ed0802b46f2d7134f6ac7781521887e573f7dc89

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

jump to
M CHANGESCHANGES

@@ -16,6 +16,7 @@ - GBA Video: Fix edge case with sprite blend modes and semitransparency

- GBA Video: Fix objwin and blending interaction on sprites - GBA Video: Fix OBJ semitransparency improperly interacting with other blending ops - GBA: Fix autodetect problems with some bad dumps of Super Mario Advance 2 + - GBA Memory: Fix bad BIOS Load16 on big endian Misc: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M src/gba/memory.csrc/gba/memory.c

@@ -442,7 +442,7 @@ if (memory->activeRegion == REGION_BIOS) {

LOAD_16(value, address, memory->bios); } else { GBALog(gba, GBA_LOG_GAME_ERROR, "Bad BIOS Load16: 0x%08X", address); - LOAD_16(value, address & 2, &memory->biosPrefetch); + value = (memory->biosPrefetch >> ((address & 2) * 8)) & 0xFFFF; } } else { GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load16: 0x%08X", address);