From 43b69907094489146315d07b6480c4ab44a34e24 Mon Sep 17 00:00:00 2001
From: zsknight <>
Date: Mon, 21 May 2001 00:25:00 +0000
Subject: [PATCH] Fixed some problems with new compatibility fixes when loaded
 in the gui.

---
 zsnes/src/init.asm | 73 +++++++++++++++++++++++-----------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index d4fe4395..ef3e995d 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1403,6 +1403,7 @@ NEWSYM Outputfilename
 ; Header hacks
 
 headerhack2:
+
     ; Megaman X2 - Header Hack
     mov esi,[romdata]
     add esi,7FC0h
@@ -1426,6 +1427,42 @@ NEWSYM headerhack
     mov dword[WindowDisables],0
     mov byte[ClearScreenSkip],0
 
+    mov esi,[romdata]
+    add esi,7FC0h
+    cmp dword[esi],'REND'
+    jne .notrend
+    mov byte[cycpb268],127
+    mov byte[cycpb358],127
+    mov byte[cycpbl2],127
+    mov byte[cycpblt2],127
+    mov byte[cycpbl],127
+    mov byte[cycpblt],127
+.notrend
+
+    mov esi,[romdata]
+    add esi,7FC0h
+    cmp dword[esi],'SP F'
+    jne .notfmatchtennis
+    mov byte[cycpb268],145
+    mov byte[cycpb358],147
+    mov byte[cycpbl2],145
+    mov byte[cycpblt2],145
+    mov byte[cycpbl],145
+    mov byte[cycpblt],145
+.notfmatchtennis
+
+    mov esi,[romdata]
+    add esi,7FC0h
+    cmp dword[esi],'TUFF'
+    jne .nottuffenuff
+    mov byte[cycpb268],75
+    mov byte[cycpb358],77
+    mov byte[cycpbl2],75
+    mov byte[cycpblt2],75
+    mov byte[cycpbl],75
+    mov byte[cycpblt],75
+.nottuffenuff
+
     cmp byte[DSP1Type],0
     je .notdis
     mov byte[disablehdma],1
@@ -2055,42 +2092,6 @@ NEWSYM initsnes
     mov dword[NoiseDisTemp],0
     mov dword[NoiseDisTemp+4],0
 
-    mov esi,[romdata]
-    add esi,7FC0h
-    cmp dword[esi],'REND'
-    jne .notrend
-    mov byte[cycpb268],127
-    mov byte[cycpb358],127
-    mov byte[cycpbl2],127
-    mov byte[cycpblt2],127
-    mov byte[cycpbl],127
-    mov byte[cycpblt],127
-.notrend
-
-    mov esi,[romdata]
-    add esi,7FC0h
-    cmp dword[esi],'SP F'
-    jne .notfmatchtennis
-    mov byte[cycpb268],145
-    mov byte[cycpb358],147
-    mov byte[cycpbl2],145
-    mov byte[cycpblt2],145
-    mov byte[cycpbl],145
-    mov byte[cycpblt],145
-.notfmatchtennis
-
-    mov esi,[romdata]
-    add esi,7FC0h
-    cmp dword[esi],'TUFF'
-    jne .nottuffenuff
-    mov byte[cycpb268],75
-    mov byte[cycpb358],77
-    mov byte[cycpbl2],75
-    mov byte[cycpblt2],75
-    mov byte[cycpbl],75
-    mov byte[cycpblt],75
-.nottuffenuff
-
     mov esi,[romdata]
     add esi,7FC0h
     cmp dword[esi],'MEGA'