From 84b79b1ba8edfbdd6fe294c75e14fe9f1b4fd82c Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 14 Apr 2018 11:43:31 -0700 Subject: [PATCH] GBA Video: Fix OBJ blending regression (fix #1037) --- src/gba/renderers/video-software.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c index a4609c01b..0b3df681a 100644 --- a/src/gba/renderers/video-software.c +++ b/src/gba/renderers/video-software.c @@ -627,7 +627,7 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render } if (softwareRenderer->target1Obj && (softwareRenderer->blendEffect == BLEND_DARKEN || softwareRenderer->blendEffect == BLEND_BRIGHTEN)) { x = 0; - uint32_t mask = 0xFF000000 & ~FLAG_OBJWIN; + uint32_t mask = FLAG_REBLEND | FLAG_TARGET_1 | FLAG_IS_BACKGROUND; uint32_t match = FLAG_REBLEND; if (GBARegisterDISPCNTIsObjwinEnable(softwareRenderer->dispcnt)) { mask |= FLAG_OBJWIN;