From 8b2632672040336876ff81a74ad6c0110af1243c Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Sat, 26 Mar 2005 23:05:47 +0000
Subject: [PATCH] Fixed a bug with Energy Breaker using a sprite on a subscreen
 that conflicted with the previous logic rework of the sprite with subscreen
 code.

---
 zsnes/src/video/newgfx16.asm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm
index 64331605..2585aef5 100644
--- a/zsnes/src/video/newgfx16.asm
+++ b/zsnes/src/video/newgfx16.asm
@@ -2552,12 +2552,17 @@ NEWSYM drawbg4linepr116b
 ; FillSubScr bit 0 sets to 1 if there is no subscreen present
 ; ms,wms,wm,ws
 ; FillSubScr scadtng
-NEWSYM drawsprng16b
+<NEWSYM drawsprng16b
     test byte[BGMS1+ebx*2],10h
     jz .nosubmain
     mov edi,[CSubWinScr]
+    test byte[FillSubScr+ebx],2
+    jnz near drawsprng16bt
+    jmp .nosubmain
+    mov edi,[CMainWinScr]
     cmp byte[edi+ebx+4*256],0
     je .nosubmain
+.submain
     test byte[FillSubScr+ebx],1
     jnz near drawsprng16bt
 .nosubmain