From bcff6a3d9d2c0ef6b547122b8595521626019478 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Sun, 6 Jul 2003 19:17:42 +0000
Subject: [PATCH] Fixed level transitions and sprite corruption in Yoshi's
 Island

---
 zsnes/src/init.asm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index f9633cdf..1df41d62 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1479,6 +1479,7 @@ NEWSYM headerhack
     mov byte[CacheCheckSkip],0
     mov word[IRQHack],0
     mov byte[HIRQSkip],0
+    mov byte[hdmaearlstart],0
     mov dword[WindowDisables],0
     mov byte[ClearScreenSkip],0
     mov byte[hirqmode2],0
@@ -1734,6 +1735,22 @@ NEWSYM headerhack
     mov byte[hirqmode2],1
 .notffmq
 
+    mov esi,[romdata]
+    add esi,07FC0h
+    cmp dword[esi],'YOSH'
+    jne .notyoshi
+    cmp dword[esi+8],'ISLA'
+    jne .notyoshi
+.notyoshi
+    cmp dword[esi],'YOSS'
+    jne .notyoshi2
+    cmp dword[esi+8],'ISLA'
+    jne .notyoshi2
+    mov byte[hdmaearlstart],2
+    mov byte[opexec268],116
+    mov byte[opexec358],126
+.notyoshi2
+
     mov esi,[romdata]
     add esi,0FFC0h
     cmp dword[esi],'BUBS'
@@ -2271,21 +2288,6 @@ NEWSYM init65816
 ;    call Outputfilename
 
     ; Check Headers
-    mov esi,[romdata]
-    mov byte[hdmaearlstart],0
-    add esi,07FC0h
-    cmp dword[esi],'YOSH'
-    jne .notyoshi
-    cmp dword[esi+8],'ISLA'
-    jne .notyoshi
-.notyoshi
-    cmp dword[esi],'YOSS'
-    jne .nohdmaearlstart
-    cmp dword[esi+8],'ISLA'
-    jne .notyoshi
-    mov byte[hdmaearlstart],2
-.nohdmaearlstart
-
     call headerhack
 
     mov byte [spcRam+0F4h],0