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

DS Video: Fix palette and OAM boundaries

This commit is contained in:
Vicki Pfau 2017-02-21 22:14:36 -08:00
parent 2037105dd2
commit 2d7b1099a9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ds/renderers/software.c
View File

@ -120,19 +120,19 @@ static uint16_t DSVideoSoftwareRendererWriteVideoRegister(struct DSVideoRenderer
static void DSVideoSoftwareRendererWritePalette(struct DSVideoRenderer* renderer, uint32_t address, uint16_t value) { static void DSVideoSoftwareRendererWritePalette(struct DSVideoRenderer* renderer, uint32_t address, uint16_t value) {
struct DSVideoSoftwareRenderer* softwareRenderer = (struct DSVideoSoftwareRenderer*) renderer; struct DSVideoSoftwareRenderer* softwareRenderer = (struct DSVideoSoftwareRenderer*) renderer;
if (address < 0x200) { if (address < 0x400) {
softwareRenderer->engA.d.writePalette(&softwareRenderer->engA.d, address & 0x1FF, value); softwareRenderer->engA.d.writePalette(&softwareRenderer->engA.d, address & 0x3FF, value);
} else { } else {
softwareRenderer->engB.d.writePalette(&softwareRenderer->engB.d, address & 0x1FF, value); softwareRenderer->engB.d.writePalette(&softwareRenderer->engB.d, address & 0x3FF, value);
} }
} }
static void DSVideoSoftwareRendererWriteOAM(struct DSVideoRenderer* renderer, uint32_t oam) { static void DSVideoSoftwareRendererWriteOAM(struct DSVideoRenderer* renderer, uint32_t oam) {
struct DSVideoSoftwareRenderer* softwareRenderer = (struct DSVideoSoftwareRenderer*) renderer; struct DSVideoSoftwareRenderer* softwareRenderer = (struct DSVideoSoftwareRenderer*) renderer;
if (oam < 0x100) { if (oam < 0x200) {
softwareRenderer->engA.d.writeOAM(&softwareRenderer->engA.d, oam & 0xFF); softwareRenderer->engA.d.writeOAM(&softwareRenderer->engA.d, oam & 0x1FF);
} else { } else {
softwareRenderer->engB.d.writeOAM(&softwareRenderer->engB.d, oam & 0xFF); softwareRenderer->engB.d.writeOAM(&softwareRenderer->engB.d, oam & 0x1FF);
} }
} }