From e0c2b3d68272e6c059f0f62f66f15756a27ce590 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 af91cf03c..3dd7b46cd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,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:
  - SDL: Remove scancode key input
  - GBA Video: Clean up unused timers
diff --git a/src/gba/renderers/software-obj.c b/src/gba/renderers/software-obj.c
index f3ee2bd49..71a409f04 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);