From 270c09c26e2b37c180fb60ceba094488230e12fd Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 29 Aug 2014 02:31:15 -0700 Subject: [PATCH] Fix palette pointer in GBALoad8 --- src/gba/gba-memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/gba-memory.c b/src/gba/gba-memory.c index aeb33191a..ed9c98b86 100644 --- a/src/gba/gba-memory.c +++ b/src/gba/gba-memory.c @@ -336,7 +336,7 @@ int8_t GBALoad8(struct ARMCore* cpu, uint32_t address, int* cycleCounter) { value = (GBAIORead(gba, address & 0xFFFE) >> ((address & 0x0001) << 3)) & 0xFF; break; case REGION_PALETTE_RAM: - value = ((int8_t*) gba->video.renderer->palette)[address & (SIZE_PALETTE_RAM - 1)]; + value = ((int8_t*) gba->video.palette)[address & (SIZE_PALETTE_RAM - 1)]; break; case REGION_VRAM: value = ((int8_t*) gba->video.renderer->vram)[address & 0x0001FFFF];