From 279c8dad7fdd9abdd59ad845a921e74fe1ef73e0 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Mon, 13 Aug 2001 00:13:08 +0000
Subject: [PATCH] Removed spindizzy hack; implemented vortex hack

---
 zsnes/src/cpu/regs.inc |  4 ++--
 zsnes/src/init.asm     | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/zsnes/src/cpu/regs.inc b/zsnes/src/cpu/regs.inc
index e28e7856..1a5df324 100644
--- a/zsnes/src/cpu/regs.inc
+++ b/zsnes/src/cpu/regs.inc
@@ -317,8 +317,8 @@ NEWSYM divres,    dw 0             ; quotent of divc/divb
 NEWSYM multres,   dw 0             ; result of multa * multb/remainder of divc/divb
 NEWSYM latchx,    dw 0             ; latched x value
 NEWSYM latchy,    dw 0             ; latched y value
-NEWSYM latchxr,   db 0             ; low or high byte read for x value
-NEWSYM latchyr,   db 0             ; low or high byte read for y value
+NEWSYM latchxr,   db 1             ; low or high byte read for x value
+NEWSYM latchyr,   db 1             ; low or high byte read for y value
 NEWSYM frskipper, db 0             ; used to control frame skipping
 NEWSYM winl1,     db 0             ; window 1 left position
 NEWSYM winr1,     db 0             ; window 1 right position
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 0933ccd2..b28d33f3 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1451,7 +1451,6 @@ NEWSYM headerhack
     mov byte[ENVDisable],0
 
     EXTSYM latchxr
-    EXTSYM latchyr
     mov esi,[romdata]
     add esi,07FC0h
     cmp dword[esi],'Supe'
@@ -1520,15 +1519,10 @@ NEWSYM headerhack
 
     mov esi,[romdata]
     add esi,07FC0h
-    cmp dword[esi],'Spin'
-    jne .notspindizzy
-    cmp dword[esi+4],' Diz'
-    jne .notspindizzy
-    cmp dword[esi+8],'zy W'
-    jne .notspindizzy
-    mov word[latchxr],1
-    mov word[latchyr],1
-.notspindizzy
+    cmp dword[esi],'VORT'
+    jne .notvortex
+    mov word[latchxr],0
+.notvortex
 
     ; Lamborgini Challenge - -p 110
     mov esi,[romdata]