From 22be254d9af85feb0920ff49453ed0e3e39ed4bb Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Mon, 28 Mar 2005 22:23:16 +0000
Subject: [PATCH] Updated windowing code, fixes for various games.

---
 zsnes/src/video/newgfx16.asm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm
index 8efbcad8..24663d5f 100644
--- a/zsnes/src/video/newgfx16.asm
+++ b/zsnes/src/video/newgfx16.asm
@@ -2555,15 +2555,23 @@ NEWSYM drawbg4linepr116b
 NEWSYM drawsprng16b
     test byte[BGMS1+ebx*2],10h
     jz .nosubmain
+    xor eax,eax
+    mov al,[BGMS1+ebx*2]
+    sub al,[FillSubScr+ebx]
+    test al,04h
+    jnz .nosub2
+    xor eax,eax
+.nosub2
+    test byte[BGMS1+ebx*2],1h
+    jz .submain
     test byte[FillSubScr+ebx],2
-    jnz near drawsprng16bt
+    jnz .submain
+    cmp eax,0
+    je .nosubmain
     mov edi,[CMainWinScr]
-    cmp byte[edi+ebx+4*256],0
-    je .submain
-    jmp .nosubmain
 .submain
     test byte[FillSubScr+ebx],1
-    jnz near drawsprng16bt
+    jne near drawsprng16bt
 .nosubmain
     mov ebp,[cpalval+ebx*4]
     xor eax,eax