From f8770dc8fea7d22319d17f2addd82dd4c9574ddc Mon Sep 17 00:00:00 2001
From: StapleButter <thetotalworm@gmail.com>
Date: Sat, 4 Mar 2017 14:51:48 +0100
Subject: don't blend semitransparent sprites with everything
---
GPU2D.cpp | 2 +-
melonDS.depend | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/GPU2D.cpp b/GPU2D.cpp
index ef7c360..14ea86e 100644
--- a/GPU2D.cpp
+++ b/GPU2D.cpp
@@ -748,7 +748,7 @@ void GPU2D::DrawScanline_Mode1(u32 line, u32* dst)
u32 coloreffect, eva, evb;
u32 flag1 = val1 >> 24;
- if (flag1 & 0x80)
+ if ((flag1 & 0x80) && (BlendCnt & ((val2 >> 16) & 0xFF00)))
{
// sprite blending
diff --git a/melonDS.depend b/melonDS.depend
index d81da60..4e93ed7 100644
--- a/melonDS.depend
+++ b/melonDS.depend
@@ -10,7 +10,7 @@
1481161027 c:\documents\sources\melonds\types.h
-1488594513 source:c:\documents\sources\melonds\nds.cpp
+1488635272 source:c:\documents\sources\melonds\nds.cpp
<stdio.h>
<string.h>
"NDS.h"
--
cgit v1.2.3