From ba65740b159a2ce3bceecf1088f859f326d69b34 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Mon, 3 Apr 2017 14:32:21 -0700
Subject: [PATCH] GB: Allow setting DMG palette

---
 include/mgba/internal/gb/video.h |  2 ++
 src/gb/core.c                    | 15 +++++++++++++++
 src/gb/video.c                   |  7 +++++++
 3 files changed, 24 insertions(+)

diff --git a/include/mgba/internal/gb/video.h b/include/mgba/internal/gb/video.h
index a7b143077..80899c723 100644
--- a/include/mgba/internal/gb/video.h
+++ b/include/mgba/internal/gb/video.h
@@ -139,6 +139,8 @@ void GBVideoWriteLYC(struct GBVideo* video, uint8_t value);
 void GBVideoWritePalette(struct GBVideo* video, uint16_t address, uint8_t value);
 void GBVideoSwitchBank(struct GBVideo* video, uint8_t value);
 
+void GBVideoSetPalette(struct GBVideo* video, unsigned index, uint16_t color);
+
 struct GBSerializedState;
 void GBVideoSerialize(const struct GBVideo* video, struct GBSerializedState* state);
 void GBVideoDeserialize(struct GBVideo* video, const struct GBSerializedState* state);
diff --git a/src/gb/core.c b/src/gb/core.c
index f7f552914..8263696f1 100644
--- a/src/gb/core.c
+++ b/src/gb/core.c
@@ -105,6 +105,21 @@ static void _GBCoreLoadConfig(struct mCore* core, const struct mCoreConfig* conf
 		gb->audio.masterVolume = core->opts.volume;
 	}
 	gb->video.frameskip = core->opts.frameskip;
+
+	int color;
+	if (mCoreConfigGetIntValue(&core->config, "gb.pal[0]", &color)) {
+			GBVideoSetPalette(&gb->video, 0, color);
+	}
+	if (mCoreConfigGetIntValue(&core->config, "gb.pal[1]", &color)) {
+			GBVideoSetPalette(&gb->video, 1, color);
+	}
+	if (mCoreConfigGetIntValue(&core->config, "gb.pal[2]", &color)) {
+			GBVideoSetPalette(&gb->video, 2, color);
+	}
+	if (mCoreConfigGetIntValue(&core->config, "gb.pal[3]", &color)) {
+			GBVideoSetPalette(&gb->video, 3, color);
+	}
+
 	mCoreConfigCopyValue(&core->config, config, "gb.bios");
 	mCoreConfigCopyValue(&core->config, config, "gbc.bios");
 
diff --git a/src/gb/video.c b/src/gb/video.c
index e1650acd9..cefe73cf7 100644
--- a/src/gb/video.c
+++ b/src/gb/video.c
@@ -439,6 +439,13 @@ void GBVideoSwitchBank(struct GBVideo* video, uint8_t value) {
 	video->vramCurrentBank = value;
 }
 
+void GBVideoSetPalette(struct GBVideo* video, unsigned index, uint16_t color) {
+	if (index >= 4) {
+		return;
+	}
+	video->dmgPalette[index] = color;
+}
+
 static void GBVideoDummyRendererInit(struct GBVideoRenderer* renderer, enum GBModel model) {
 	UNUSED(renderer);
 	UNUSED(model);