From c48317b3a806fd10fbad97c0d413748a9cdf7a21 Mon Sep 17 00:00:00 2001
From: zsknight <>
Date: Mon, 14 May 2001 02:13:13 +0000
Subject: [PATCH] Fixed Ghouls & Ghost mode 7 problem

---
 zsnes/src/video/newgfx.asm   | 6 +++---
 zsnes/src/video/newgfx.mac   | 1 +
 zsnes/src/video/newgfx16.asm | 6 +++---
 zsnes/src/video/newgfx16.mac | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/zsnes/src/video/newgfx.asm b/zsnes/src/video/newgfx.asm
index 25ac9c25..af64a8a4 100644
--- a/zsnes/src/video/newgfx.asm
+++ b/zsnes/src/video/newgfx.asm
@@ -1076,7 +1076,7 @@ NEWSYM StartDrawNewGfx
     je near .noextbgsc
     test dword[bgcmsung],300h
     jz near .noextbgsc
-    ProcMode7ngextbg 100h, 1h
+    ProcMode7ngextbg 300h, 3h
 .noextbgsc
 
     ; draw sprites mode 2-7
@@ -1257,9 +1257,9 @@ NEWSYM StartDrawNewGfx
     ; draw mode 7 extbg pr 0
     cmp byte[ngextbg],0
     je near .noextbgmn
-    test dword[bgcmsung],1h
+    test dword[bgcmsung],3h
     jz near .noextbgmn
-    ProcMode7ngextbg 1h, 0
+    ProcMode7ngextbg 3h, 0
 .noextbgmn
 
     ; draw sprites mode 2-7
diff --git a/zsnes/src/video/newgfx.mac b/zsnes/src/video/newgfx.mac
index 7baa9c85..6dc1849a 100644
--- a/zsnes/src/video/newgfx.mac
+++ b/zsnes/src/video/newgfx.mac
@@ -651,6 +651,7 @@ EXTSYM drawmode7ngextbg,drawmode7ngextbg2
     add ax,[BG1SYl+ebx*2]
     mov [curvidoffset],esi
     push esi
+    jmp %%drawb
     cmp byte[esi-1],1
     je %%drawb
     call drawmode7ngextbg
diff --git a/zsnes/src/video/newgfx16.asm b/zsnes/src/video/newgfx16.asm
index 33c29c1e..28abb8b1 100644
--- a/zsnes/src/video/newgfx16.asm
+++ b/zsnes/src/video/newgfx16.asm
@@ -1480,7 +1480,7 @@ NEWSYM StartDrawNewGfx16b
     je near .noextbgsc
     test dword[bgcmsung],300h
     jz near .noextbgsc
-    ProcMode7ngextbg16b ngsub, 1h
+    ProcMode7ngextbg16b ngsub, 3h
 .noextbgsc
 
     ; draw sprites mode 2-7
@@ -1666,9 +1666,9 @@ NEWSYM StartDrawNewGfx16b
     ; draw mode 7 extbg pr 0
     cmp byte[ngextbg],0
     je near .noextbgmn
-    test dword[bgcmsung],101h
+    test dword[bgcmsung],303h
     jz near .noextbgmn
-    ProcMode7ngextbg16b ngmain ,1h
+    ProcMode7ngextbg16b ngmain ,3h
 .noextbgmn
 
     ; draw sprites mode 2-7
diff --git a/zsnes/src/video/newgfx16.mac b/zsnes/src/video/newgfx16.mac
index b5285c6d..2ebec77e 100644
--- a/zsnes/src/video/newgfx16.mac
+++ b/zsnes/src/video/newgfx16.mac
@@ -1635,6 +1635,7 @@ EXTSYM osm2dis
     add ax,[BG1SYl+ebx*2]
     mov [curvidoffset],esi
     push esi
+    jmp %%drawb
     cmp byte[esi-1],1
     je %%drawb
     call drawmode7ngextbg16b