From a5ad1c4099ff56148f9c1983492b956163912ec3 Mon Sep 17 00:00:00 2001
From: Ian Curtis <i.curtis@gmail.com>
Date: Sun, 7 Oct 2018 19:31:55 +0000
Subject: [PATCH] Revert some patches (Spindizzi)

---
 Config/Games.xml | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/Config/Games.xml b/Config/Games.xml
index 0cfd12e..9bbc9d6 100644
--- a/Config/Games.xml
+++ b/Config/Games.xml
@@ -847,13 +847,17 @@
         <input type="vehicle" />
         <input type="vr4" />
         <input type="shiftupdown" />
-      </inputs>
-    </hardware>
-    <roms>
-      <!-- Base offset of program in CROM space: 0x6473c0 (0x0473c0 in the ROM) -->
-      <region name="crom" stride="8" chunk_size="2" byte_swap="true">
-        <file offset="0" name="epr-19890b.20" crc32="0x9C16C3CC" />
-        <file offset="2" name="epr-19889b.19" crc32="0xD1F7E44C" />
+      </inputs>
+    </hardware>
+    <roms>
+      <patches>
+        <!-- Base offset of program in CROM space: 0x6473c0 (0x473c0 in the ROM) -->
+        <patch region="crom" bits="32" offset="0x0D8C4C" value="0x00000002" />  <!-- comm. mode: 00=master, 01=slave, 02=satellite -->
+        <patch region="crom" bits="32" offset="0x13FE38" value="0x38840004" />  <!-- an actual bug in the game code -->
+      </patches>
+      <region name="crom" stride="8" chunk_size="2" byte_swap="true">
+        <file offset="0" name="epr-19890b.20" crc32="0x9C16C3CC" />
+        <file offset="2" name="epr-19889b.19" crc32="0xD1F7E44C" />
         <file offset="4" name="epr-19888b.18" crc32="0x800D763D" />
         <file offset="6" name="epr-19887b.17" crc32="0x2842BB87" />
       </region>
@@ -2342,12 +2346,24 @@
         <input type="joystick2" />
         <input type="soccer" />
       </inputs>
-      <encryption_key>0x29234e96</encryption_key>
-    </hardware>
-    <roms>
-      <region name="crom" stride="8" chunk_size="2" byte_swap="true">
-        <file offset="0" name="epr-20920.20" crc32="0x428D05FC" />
-        <file offset="2" name="epr-20919.19" crc32="0x7A0713D2" />
+      <encryption_key>0x29234e96</encryption_key>
+    </hardware>
+    <roms>
+    	<patches>
+        <!-- 
+          Offset of program relative to CROM base: 0x600000 (0x200000 in the 
+          ROM itself). Inexplicably, at PC=AFC1C, a call is made to FC78, which
+          is right in the middle of some totally unrelated initialization code 
+          (ASIC checks). This causes an invalid pointer to be fetched. Perhaps
+          FC78 should be overwritten with other program data by then? Why is it
+          not? Or, 300138 needs to be written with a non-zero value, it is
+          loaded from EEPROM but is 0.
+        -->
+        <patch region="crom" bits="32" offset="0x2afc1c" value="0x60000000" />  <!-- 0x6afc1c from base of CROM -->
+      </patches>
+      <region name="crom" stride="8" chunk_size="2" byte_swap="true">
+        <file offset="0" name="epr-20920.20" crc32="0x428D05FC" />
+        <file offset="2" name="epr-20919.19" crc32="0x7A0713D2" />
         <file offset="4" name="epr-20918.18" crc32="0x0E9CDC5B" />
         <file offset="6" name="epr-20917.17" crc32="0xC3BBB270" />
       </region>