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

GB Video: Fix SGB palettes on load state

This commit is contained in:
Vicki Pfau 2018-04-02 12:20:52 -07:00
parent c9f50b2c5a
commit 97e94610e6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gb/renderers/software.c
View File

@ -359,6 +359,9 @@ static void GBVideoSoftwareRendererWriteSGBPacket(struct GBVideoRenderer* render
static void GBVideoSoftwareRendererWritePalette(struct GBVideoRenderer* renderer, int index, uint16_t value) { static void GBVideoSoftwareRendererWritePalette(struct GBVideoRenderer* renderer, int index, uint16_t value) {
struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer; struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer;
color_t color = mColorFrom555(value); color_t color = mColorFrom555(value);
if (softwareRenderer->model == GB_MODEL_SGB && index < 0x10 && index && !(index & 3)) {
color = softwareRenderer->palette[0];
}
softwareRenderer->palette[index] = color; softwareRenderer->palette[index] = color;
if (renderer->cache) { if (renderer->cache) {
mCacheSetWritePalette(renderer->cache, index, color); mCacheSetWritePalette(renderer->cache, index, color);

14
src/gb/video.c
View File

@ -606,12 +606,12 @@ void GBVideoWriteSGBPacket(struct GBVideo* video, uint8_t* data) {
video->renderer->writePalette(video->renderer, 1, video->palette[1]); video->renderer->writePalette(video->renderer, 1, video->palette[1]);
video->renderer->writePalette(video->renderer, 2, video->palette[2]); video->renderer->writePalette(video->renderer, 2, video->palette[2]);
video->renderer->writePalette(video->renderer, 3, video->palette[3]); video->renderer->writePalette(video->renderer, 3, video->palette[3]);
video->renderer->writePalette(video->renderer, 4, video->palette[0]); video->renderer->writePalette(video->renderer, 4, video->palette[4]);
video->renderer->writePalette(video->renderer, 5, video->palette[5]); video->renderer->writePalette(video->renderer, 5, video->palette[5]);
video->renderer->writePalette(video->renderer, 6, video->palette[6]); video->renderer->writePalette(video->renderer, 6, video->palette[6]);
video->renderer->writePalette(video->renderer, 7, video->palette[7]); video->renderer->writePalette(video->renderer, 7, video->palette[7]);
video->renderer->writePalette(video->renderer, 8, video->palette[0]); video->renderer->writePalette(video->renderer, 8, video->palette[8]);
video->renderer->writePalette(video->renderer, 12, video->palette[0]); video->renderer->writePalette(video->renderer, 12, video->palette[12]);
break; break;
case SGB_PAL23: case SGB_PAL23:
video->palette[9] = data[3] | (data[4] << 8); video->palette[9] = data[3] | (data[4] << 8);
@ -645,9 +645,9 @@ void GBVideoWriteSGBPacket(struct GBVideo* video, uint8_t* data) {
video->renderer->writePalette(video->renderer, 1, video->palette[1]); video->renderer->writePalette(video->renderer, 1, video->palette[1]);
video->renderer->writePalette(video->renderer, 2, video->palette[2]); video->renderer->writePalette(video->renderer, 2, video->palette[2]);
video->renderer->writePalette(video->renderer, 3, video->palette[3]); video->renderer->writePalette(video->renderer, 3, video->palette[3]);
video->renderer->writePalette(video->renderer, 4, video->palette[0]); video->renderer->writePalette(video->renderer, 4, video->palette[4]);
video->renderer->writePalette(video->renderer, 8, video->palette[0]); video->renderer->writePalette(video->renderer, 8, video->palette[8]);
video->renderer->writePalette(video->renderer, 12, video->palette[0]); video->renderer->writePalette(video->renderer, 12, video->palette[12]);
video->renderer->writePalette(video->renderer, 13, video->palette[13]); video->renderer->writePalette(video->renderer, 13, video->palette[13]);
video->renderer->writePalette(video->renderer, 14, video->palette[14]); video->renderer->writePalette(video->renderer, 14, video->palette[14]);
video->renderer->writePalette(video->renderer, 15, video->palette[15]); video->renderer->writePalette(video->renderer, 15, video->palette[15]);
@ -675,7 +675,7 @@ void GBVideoWriteSGBPacket(struct GBVideo* video, uint8_t* data) {
continue; continue;
} }
LOAD_16LE(video->palette[i * 4 + 0], entry * 8 + 0, video->renderer->sgbPalRam); LOAD_16LE(video->palette[i * 4 + 0], entry * 8 + 0, video->renderer->sgbPalRam);
video->renderer->writePalette(video->renderer, i * 4 + 0, video->palette[0]); video->renderer->writePalette(video->renderer, i * 4 + 0, video->palette[i * 4 + 0]);
LOAD_16LE(video->palette[i * 4 + 1], entry * 8 + 2, video->renderer->sgbPalRam); LOAD_16LE(video->palette[i * 4 + 1], entry * 8 + 2, video->renderer->sgbPalRam);
video->renderer->writePalette(video->renderer, i * 4 + 1, video->palette[i * 4 + 1]); video->renderer->writePalette(video->renderer, i * 4 + 1, video->palette[i * 4 + 1]);
LOAD_16LE(video->palette[i * 4 + 2], entry * 8 + 4, video->renderer->sgbPalRam); LOAD_16LE(video->palette[i * 4 + 2], entry * 8 + 4, video->renderer->sgbPalRam);