From 3bc11f640eae9345119c64526c1c10318a9419ef Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Sun, 21 Dec 2003 08:01:34 +0000
Subject: [PATCH] Remove the Megaman X hack because we don't need it anymore

---
 zsnes/src/cpu/memory.asm | 16 ----------------
 zsnes/src/init.asm       | 12 ------------
 2 files changed, 28 deletions(-)

diff --git a/zsnes/src/cpu/memory.asm b/zsnes/src/cpu/memory.asm
index 7c3f71dc..f592d5f3 100644
--- a/zsnes/src/cpu/memory.asm
+++ b/zsnes/src/cpu/memory.asm
@@ -4361,8 +4361,6 @@ NEWSYM sramaccessbankw16s
     pop ecx
     ret
 
-EXTSYM MMXSRAMFix
-
 NEWSYM sramaccessbankr8b
     cmp dword[ramsize],0
     je .noaccess
@@ -4374,17 +4372,10 @@ NEWSYM sramaccessbankr8b
     xor ebx,ebx
     ret
 .noaccess
-    cmp byte[MMXSRAMFix],1
-    je .MMXSRAMFix
     xor al,al
     xor ebx,ebx
     ret
 
-.MMXSRAMFix
-    mov al,0FFh
-    xor ebx,ebx
-    ret
-
 NEWSYM sramaccessbankr16b
     cmp dword[ramsize],0
     je .noaccess
@@ -4399,17 +4390,10 @@ NEWSYM sramaccessbankr16b
     xor ebx,ebx
     ret
 .noaccess
-    cmp byte[MMXSRAMFix],1
-    je .MMXSRAMFix
     xor ax,ax
     xor ebx,ebx
     ret
 
-.MMXSRAMFix
-    mov ax,0FFFFh
-    xor ebx,ebx
-    ret
-
 NEWSYM sramaccessbankw8b
     cmp dword[ramsize],0
     je .noaccess
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 519b300a..15064cea 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1710,22 +1710,10 @@ SECTION .bss
 NEWSYM curromsize, resb 1
 NEWSYM cromptradd, resd 1
 NEWSYM lorommapmode2, resb 1
-NEWSYM MMXSRAMFix, resb 1
 SECTION .text
 
 NEWSYM initsnes
     mov byte[ForceNewGfxOff],0
-    mov byte[MMXSRAMFix],0
-
-    ;Megaman/Rockman X
-    mov esi,[romdata]
-    add esi,7FC0h
-    cmp dword[esi+4],'MAN '
-    jne .notmmx
-    cmp dword[esi+8],'X   '
-    jne .notmmx
-;    mov byte[MMXSRAMFix],1
-.notmmx
 
     mov esi,[romdata]
     add esi,7FC0h