From e9e29610a4847edb984075016f146ba75fd5044f Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Thu, 25 Apr 2013 01:48:28 -0700 Subject: [PATCH] Read from palette memory --- src/gba/gba-memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gba/gba-memory.c b/src/gba/gba-memory.c index 6c13fe58b..9bfbeaaa9 100644 --- a/src/gba/gba-memory.c +++ b/src/gba/gba-memory.c @@ -115,7 +115,7 @@ int32_t GBALoad32(struct ARMMemory* memory, uint32_t address) { case BASE_IO: return GBAIORead(gbaMemory->p, address & (SIZE_IO - 1)) | (GBAIORead(gbaMemory->p, (address & (SIZE_IO - 1)) | 2) << 16); case BASE_PALETTE_RAM: - break; + return ((int32_t*) gbaMemory->p->video.palette)[(address & (SIZE_PALETTE_RAM - 1)) >> 2]; case BASE_VRAM: return ((int32_t*) gbaMemory->p->video.vram)[(address & 0x0001FFFF) >> 2]; case BASE_OAM: @@ -149,7 +149,7 @@ int16_t GBALoad16(struct ARMMemory* memory, uint32_t address) { case BASE_IO: return GBAIORead(gbaMemory->p, address & (SIZE_IO - 1)); case BASE_PALETTE_RAM: - break; + return gbaMemory->p->video.palette[(address & (SIZE_PALETTE_RAM - 1)) >> 1]; case BASE_VRAM: return gbaMemory->p->video.vram[(address & 0x0001FFFF) >> 1]; case BASE_OAM: @@ -183,7 +183,7 @@ uint16_t GBALoadU16(struct ARMMemory* memory, uint32_t address) { case BASE_IO: return GBAIORead(gbaMemory->p, address & (SIZE_IO - 1)); case BASE_PALETTE_RAM: - break; + return gbaMemory->p->video.palette[(address & (SIZE_PALETTE_RAM - 1)) >> 1]; case BASE_VRAM: return gbaMemory->p->video.vram[(address & 0x0001FFFF) >> 1]; case BASE_OAM: