From 0e73c23b71bdd6bfe9f0fa62b442a0559c9beca7 Mon Sep 17 00:00:00 2001
From: jbo_85 <>
Date: Sun, 16 Oct 2005 13:51:35 +0000
Subject: [PATCH] Hacks can now be disabled via command line (-dh).

---
 zsnes/src/initc.c   | 11 +++++------
 zsnes/src/zloader.c |  8 +++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/zsnes/src/initc.c b/zsnes/src/initc.c
index d2bbe8ec..b33ad145 100755
--- a/zsnes/src/initc.c
+++ b/zsnes/src/initc.c
@@ -1440,6 +1440,7 @@ extern unsigned char  opexec358cphb;
 extern unsigned char  DSP1Type;
 extern unsigned int   ewj2hack;
 extern unsigned char  cycpl;
+unsigned char HacksDisable;
 
 void headerhack()
 {
@@ -1450,12 +1451,12 @@ void headerhack()
   ClearScreenSkip = 0;
   ENVDisable = 0;
 
-  if (curromspace < Lo)
+  if ((curromspace < Lo) || (HacksDisable && !DSP1Type))
   {
     return;
   }
 
-  //These next fiew look like RAM init hacks, should be looked into
+  //These next few look like RAM init hacks, should be looked into
 
   //Should be Super Famista (J), uses non-standard characters
   if (!strncmp((RomData+Lo),"\x0bd\x0b0\x0ca\x0df\x0b0\x0cc\x0a7\x0d0\x0bd\x0c0      " ,16))
@@ -1675,8 +1676,6 @@ void headerhack()
     opexec268cph = 80;
     opexec358cph = 80;
   }
-
-  return;
 }
 
 extern unsigned char per2exec;
@@ -1684,8 +1683,8 @@ extern unsigned char per2exec;
 void Setper2exec()
 {
   if (per2exec != 100)
-  {	// Decrease standard % of execution by 5% to replace branch and 16bit
-	// cycle deductions
+  { // Decrease standard % of execution by 5% to replace branch and 16bit
+    // cycle deductions
     opexec268b = (unsigned char)((opexec268 * 95 * per2exec) / 10000);
     opexec358b = (unsigned char)((opexec358 * 87 * per2exec) / 10000); // 82
     opexec268cphb = (unsigned char)((opexec268cph * 95 * per2exec) / 10000);
diff --git a/zsnes/src/zloader.c b/zsnes/src/zloader.c
index dbcf440f..bd731583 100644
--- a/zsnes/src/zloader.c
+++ b/zsnes/src/zloader.c
@@ -48,7 +48,7 @@ extern unsigned char Palette0, pl1contrl, pl2contrl, MMXSupport, Force8b, ForceP
                      SnowOn, Triplebufen, SPC700sh, OffBy1Line, DSPDisable, frameskip,
                      gammalevel, guioff, romtype, per2exec, scanlines, soundon, spcon,
                      showallext, autoloadstate, smallscreenon, autoloadmovie, ZMVZClose,
-                     ZMVRawDump;
+                     ZMVRawDump, HacksDisable;
 
 extern char *STCart2, fname;
 
@@ -88,6 +88,7 @@ static void display_help()
   put_line("  -d      Start with debugger enabled");
 #endif
   put_line("  -dd     Disable sound DSP emulation");
+  put_line("  -dh     Disable hacks");
 #ifdef __MSDOS__
   put_line("  -e      Skip enter key press at the beginning");
 #endif
@@ -475,6 +476,11 @@ static void handle_params(int argc, char *argv[])
           DSPDisable = 1;
         }
 
+        else if (tolower(argv[i][1]) == 'd' && tolower(argv[i][2]) == 'h') //Disable hacks
+        {
+          HacksDisable = 1;
+        }
+
         #ifdef __WIN32__
         else if (tolower(argv[i][1]) == 'k' && tolower(argv[i][2]) == 's') //Enable KitchenSync
         {