From 7dfa195e5300239a9b79684dac26548cc84d02e9 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Fri, 3 Mar 2017 18:51:50 -0800
Subject: [PATCH] GBA Video: Fix wrong palette on 256-color sprites in OBJWIN

---
 CHANGES                          | 1 +
 src/gba/renderers/software-obj.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 4150b5468..1af32c782 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ Bugfixes:
  - GBA I/O: Handle audio registers specially when deserializing
  - Util: Fix highest-fd socket not being returned by SocketAccept
  - Qt: Fix linking after some windows have been closed
+ - GBA Video: Fix wrong palette on 256-color sprites in OBJWIN
 Misc:
  - Qt: Improved HiDPI support
  - Feature: Support ImageMagick 7
diff --git a/src/gba/renderers/software-obj.c b/src/gba/renderers/software-obj.c
index b2a99361e..d49f99dff 100644
--- a/src/gba/renderers/software-obj.c
+++ b/src/gba/renderers/software-obj.c
@@ -317,7 +317,6 @@ int GBAVideoSoftwareRendererPreprocessSprite(struct GBAVideoSoftwareRenderer* re
 				SPRITE_NORMAL_LOOP(256, OBJWIN);
 			} else if (mosaicH > 1) {
 				if (objwinSlowPath) {
-					objwinPalette = &objwinPalette[GBAObjAttributesCGetPalette(sprite->c) << 4];
 					SPRITE_MOSAIC_LOOP(256, NORMAL_OBJWIN);
 				} else {
 					SPRITE_MOSAIC_LOOP(256, NORMAL);