From d6050ad3f39fd35e36279b60f325a1658c4a80bc Mon Sep 17 00:00:00 2001
From: grinvader <>
Date: Mon, 27 Feb 2006 17:32:09 +0000
Subject: [PATCH] Silly DSP code removed, should fix a lot of games (including
 EWJ2) [pagefault]. Removed now useless EWJ2 hacks.

---
 zsnes/src/cpu/dma.asm     |  8 --------
 zsnes/src/cpu/dspproc.asm | 14 --------------
 zsnes/src/initc.c         | 11 -----------
 3 files changed, 33 deletions(-)

diff --git a/zsnes/src/cpu/dma.asm b/zsnes/src/cpu/dma.asm
index ec2f9f46..d98bbd82 100644
--- a/zsnes/src/cpu/dma.asm
+++ b/zsnes/src/cpu/dma.asm
@@ -1154,19 +1154,11 @@ section .data
 .fname2 db 9,'vram2.dat',0
 section .text
 
-section .data
-NEWSYM ewj2hack, dd 0
-section .text
-
 NEWSYM hdmatype2indirect
-    cmp dword[ewj2hack],1
-    jne near .notend
     cmp byte[esi+1],40h ; Writing to spc
     jne near .notend
     cmp byte[esi+10],0DAh ; first transfer
     jne near .notend
-    ; EWJ2 HACK
-;    int 3h
     push eax
     push ebx
     push ecx
diff --git a/zsnes/src/cpu/dspproc.asm b/zsnes/src/cpu/dspproc.asm
index 0d34bb78..3b1789bd 100644
--- a/zsnes/src/cpu/dspproc.asm
+++ b/zsnes/src/cpu/dspproc.asm
@@ -4519,25 +4519,11 @@ NEWSYM EchoStereo
     mov dword[Voice0IncNumber+%1*4],0
     mov byte[Voice0Status+%1],0
     mov byte[Voice0State+%1],0
-;    cmp byte[ENVDisable],1
-;    je %%noSkipStuff
-;%%noSkipStuff
-    mov byte[DSPMem+08h+%1*10h],0
-    mov byte[DSPMem+09h+%1*10h],0
-    or byte[DSPMem+7Ch],%3
-%%SkipStuff
     jmp %2
 %%EndofSamp2
     mov dword[Voice0EnvInc+%1*4],0
     mov dword[Voice0IncNumber+%1*4],0
     mov byte[Voice0State+%1],0
-    cmp byte[ENVDisable],1
-    je %%noSkipStuff2
-%%noSkipStuff2
-    mov byte[DSPMem+08h+%1*10h],0
-    mov byte[DSPMem+09h+%1*10h],0
-    or byte[DSPMem+7Ch],%3
-%%SkipStuff2
     mov al,%1
     call VoiceStarter
     jmp %%SkipProcess2
diff --git a/zsnes/src/initc.c b/zsnes/src/initc.c
index 7802d1de..d538908b 100755
--- a/zsnes/src/initc.c
+++ b/zsnes/src/initc.c
@@ -1439,7 +1439,6 @@ extern unsigned char  opexec358cph;
 extern unsigned char  opexec268cphb;
 extern unsigned char  opexec358cphb;
 extern unsigned char  DSP1Type;
-extern unsigned int   ewj2hack;
 extern unsigned char  cycpl;
 unsigned char HacksDisable;
 
@@ -1634,16 +1633,6 @@ void headerhack()
   //Okaaay...
   if(DSP1Type) { disablehdma = true; }
 
-  //Earthworm Jim 2 (all regions?)
-  if (!strncmp((RomData+Lo),"EARTHWORM JIM 2     " ,20))
-  {
-    RomData[0x2A9C1A] = 0;
-    RomData[0x2A9C1B] = 0;
-    RomData[0x2A9C1F] = 0;
-    RomData[0x2A9C20] = 0;
-    ewj2hack = true;
-  }
-
   //Lamborghini - American Challenge (U/E)
   if (!strncmp((RomData+Lo), "LAMBORGHINI AMERICAN", 20))
   {