From 8bcfc2b68948e80e76bd21ce69b7332f85611d9a Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sat, 2 Nov 2019 19:23:38 +0100
Subject: [PATCH] improve FC detection and bank switching

---
 src/emucore/CartDetector.cxx | 16 +++++++++++++---
 src/emucore/CartFC.cxx       |  5 +++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx
index e1b8b5cfc..e7ac42cbf 100644
--- a/src/emucore/CartDetector.cxx
+++ b/src/emucore/CartDetector.cxx
@@ -368,6 +368,8 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
       type = Bankswitch::Type::_CV;
     else if(isProbably4KSC(image, size))
       type = Bankswitch::Type::_4KSC;
+    else if (isProbablyFC(image, size))
+      type = Bankswitch::Type::_FC;
     else
       type = Bankswitch::Type::_4K;
   }
@@ -401,6 +403,8 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
       type = Bankswitch::Type::_E78K;
     else if (isProbablyWD(image,size))
       type = Bankswitch::Type::_WD;
+    else if (isProbablyFC(image, size))
+      type = Bankswitch::Type::_FC;
     else
       type = Bankswitch::Type::_F8;
   }
@@ -936,10 +940,16 @@ bool CartDetector::isProbablyFA2(const ByteBuffer& image, size_t)
 bool CartDetector::isProbablyFC(const ByteBuffer& image, size_t size)
 {
   // FC bankswitching uses consecutive writes to 3 hotspots
-  uInt8 signature[6] = {
-    0x8e, 0xf8, 0xff, 0x8c, 0xf9, 0xff // STX $FFF8, STY $FFF9
+  uInt8 signature[2][6] = {
+    { 0x8d, 0xf8, 0x1f, 0x4a, 0x4a, 0x8d }, // STA $1FF8, LSR, LSR, STA... Power Play Arcade Menus, 3-D Ghost Attack
+    { 0x8d, 0xf8, 0xff, 0x8d, 0xfc, 0xff }, // STA $FFF8, STA $FFFC        Surf's Up (4K)
+    //{ 0x8c, 0xf9, 0xff, 0xad, 0xfc, 0xff }  // STY $FFF9, LDA $FFFC        3-D Havoc (patched for F8, ignore!)
   };
-  return (searchForBytes(image.get(), size, signature, 6, 1));
+  for (uInt32 i = 0; i < 2; ++i)
+    if (searchForBytes(image.get(), size, signature[i], 6, 1))
+      return true;
+
+  return false;
 }
 
 
diff --git a/src/emucore/CartFC.cxx b/src/emucore/CartFC.cxx
index fdf2392f8..a5f3e74a0 100644
--- a/src/emucore/CartFC.cxx
+++ b/src/emucore/CartFC.cxx
@@ -90,6 +90,11 @@ bool CartridgeFC::poke(uInt16 address, uInt8 value)
       myTargetBank %= bankCount();
       break;
 
+    case 0x0FFC:
+      // Trigger the bank switch
+      bank(myTargetBank);
+      break;
+
     default:
       break;
   }