ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Read from palette memory

This commit is contained in:
Jeffrey Pfau 2013-04-25 01:48:28 -07:00
parent 65e0445375
commit e9e29610a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gba/gba-memory.c
View File

@ -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: