7 files changed, 0 insertions, 81 deletions
diff --git a/old/spc700/debug/port.h b/old/spc700/debug/port.h
index 1a056fb..e7c3e8e 100644
--- a/old/spc700/debug/port.h
+++ b/old/spc700/debug/port.h
@@ -174,8 +174,6 @@ void gp32_fseek (long position,int ref,long *s);
 #define CPU_SHUTDOWN
 #define VAR_CYCLES
 #define SPC700_C
-//#define ZSNES_C4
-//#define ZSNES_FX
 #define EXECUTE_SUPERFX_PER_LINE
 //#define THREADCPU
 
diff --git a/src/c4.c b/src/c4.c
index 1a7c58d..e7d8ce8 100644
--- a/src/c4.c
+++ b/src/c4.c
@@ -427,14 +427,5 @@ void C4Op0D()
    */
 }
 
-#ifdef ZSNES_C4
-void C4LoaDMem(char* C4RAM)
-{
-   memmove(C4RAM + (READ_WORD(C4RAM + 0x1f45) & 0x1fff),
-           C4GetMemPointer(READ_3WORD(C4RAM + 0x1f40)),
-           READ_WORD(C4RAM + 0x1f43));
-}
-#endif
-
 END_EXTERN_C
 
diff --git a/src/globals.c b/src/globals.c
index 5edbe14..152be5f 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -99,13 +99,7 @@ SSNESGameFixes SNESGameFixes;
 
 END_EXTERN_C
 
-#ifndef ZSNES_FX
 FxInit_s SuperFX;
-#else
-START_EXTERN_C
-uint8* SFXPlotTable = NULL;
-END_EXTERN_C
-#endif
 
 SPPU PPU;
 InternalPPU IPPU;
diff --git a/src/memmap.c b/src/memmap.c
index 4861510..066b7aa 100644
--- a/src/memmap.c
+++ b/src/memmap.c
@@ -56,14 +56,8 @@
 #include "srtc.h"
 #include "sdd1.h"
 
-#ifndef ZSNES_FX
 #include "fxemu.h"
 extern FxInit_s SuperFX;
-#else
-START_EXTERN_C
-extern uint8 *SFXPlotTable;
-END_EXTERN_C
-#endif
 
 static uint8 bytes0x2000 [0x2000];
 
@@ -205,15 +199,11 @@ bool8_32 MemoryInit ()
     SRAM   = Memory.SRAM;
     RegRAM = Memory.FillRAM;
 
-#ifdef ZSNES_FX
-    SFXPlotTable = ROM + 0x400000;
-#else
     SuperFX.pvRegisters = &Memory.FillRAM [0x3000];
     SuperFX.nRamBanks = 1;
     SuperFX.pvRam = SRAM;
     SuperFX.nRomBanks = (2 * 1024 * 1024) / (32 * 1024);
     SuperFX.pvRom = (uint8 *) Memory.ROM;
-#endif
 
     ZeroMemory (IPPU.TileCached [TILE_2BIT], MAX_2BIT_TILES);
     ZeroMemory (IPPU.TileCached [TILE_4BIT], MAX_4BIT_TILES);
@@ -695,9 +685,7 @@ void S9xDeinterleaveMode2 ()
 
 void InitROM (bool8_32 Interleaved)
 {
-#ifndef ZSNES_FX
     SuperFX.nRomBanks = Memory.CalculatedSize >> 15;
-#endif
     Settings.MultiPlayer5Master = Settings.MultiPlayer5;
     Settings.MouseMaster = Settings.Mouse;
     Settings.SuperScopeMaster = Settings.SuperScope;
diff --git a/src/ppu.c b/src/ppu.c
index cdd8048..daa8a5b 100644
--- a/src/ppu.c
+++ b/src/ppu.c
@@ -53,15 +53,10 @@
 
 #include "port.h"
 
-#ifndef ZSNES_FX
 #include "fxemu.h"
 #include "fxinst.h"
 extern FxInit_s SuperFX;
 extern FxRegs_s GSU;
-#else
-EXTERN_C void S9xSuperFXWriteReg(uint8, uint32);
-EXTERN_C uint8 S9xSuperFXReadReg(uint32);
-#endif
 extern uint8* HDMAMemPointers [8];
 
 void S9xUpdateHTimer()
diff --git a/src/ppu_.c b/src/ppu_.c
index 4dc1a31..d0150b8 100644
--- a/src/ppu_.c
+++ b/src/ppu_.c
@@ -52,15 +52,10 @@
 #include "srtc.h"
 
 
-#ifndef ZSNES_FX
 #include "fxemu.h"
 #include "fxinst.h"
 extern FxInit_s SuperFX;
 extern FxRegs_s GSU;
-#else
-EXTERN_C void S9xSuperFXWriteReg(uint8, uint32);
-EXTERN_C uint8 S9xSuperFXReadReg(uint32);
-#endif
 
 void S9xUpdateHTimer()
 {
@@ -888,11 +883,6 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
             if (!Settings.SuperFX)
                return;
 
-#ifdef ZSNES_FX
-            Memory.FillRAM [Address] = Byte;
-            if (Address < 0x3040)
-               S9xSuperFXWriteReg(Byte, Address);
-#else
             switch (Address)
             {
             case 0x3030:
@@ -950,7 +940,6 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
                   FxCacheWriteAccess(Address);
                break;
             }
-#endif
             return;
          }
    }
@@ -1361,19 +1350,6 @@ uint8 S9xGetPPU(uint16 Address)
 
       if (!Settings.SuperFX)
          return (0x30);
-#ifdef ZSNES_FX
-      if (Address < 0x3040)
-         byte = S9xSuperFXReadReg(Address);
-      else
-         byte = Memory.FillRAM [Address];
-
-#ifdef CPU_SHUTDOWN
-      if (Address == 0x3030)
-         CPU.WaitAddress = CPU.PCAtOpcodeStart;
-#endif
-      if (Address == 0x3031)
-         CLEAR_IRQ_SOURCE(GSU_IRQ_SOURCE);
-#else
       byte = Memory.FillRAM [Address];
 
       //if (Address != 0x3030 && Address != 0x3031)
@@ -1389,7 +1365,6 @@ uint8 S9xGetPPU(uint16 Address)
             Memory.FillRAM [0x3031] = byte & 0x7f;
          }
       return (byte);
-#endif
    }
 
    return (byte);
@@ -2540,7 +2515,6 @@ void S9xUpdateJoypads()
    }
 }
 
-#ifndef ZSNES_FX
 void S9xSuperFXExec()
 {
    if (Settings.SuperFX)
@@ -2563,4 +2537,3 @@ void S9xSuperFXExec()
    }
 
 }
-#endif
diff --git a/src/snapshot.c b/src/snapshot.c
index 2b03383..9ab89a6 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -71,14 +71,6 @@ extern void (*statef_close)();
 
 extern uint8* SRAM;
 
-#ifdef ZSNES_FX
-START_EXTERN_C
-void S9xSuperFXPreSaveState();
-void S9xSuperFXPostSaveState();
-void S9xSuperFXPostLoadState();
-END_EXTERN_C
-#endif
-
 //bool8 S9xUnfreezeZSNES (const char *filename);
 
 typedef struct
@@ -480,10 +472,6 @@ static void Freeze()
    int i;
 
    S9xSetSoundMute(TRUE);
-#ifdef ZSNES_FX
-   if (Settings.SuperFX)
-      S9xSuperFXPreSaveState();
-#endif
 
    S9xSRTCPreSaveState();
 
@@ -536,10 +524,6 @@ static void Freeze()
    }
 #endif
    S9xSetSoundMute(FALSE);
-#ifdef ZSNES_FX
-   if (Settings.SuperFX)
-      S9xSuperFXPostSaveState();
-#endif
 }
 
 static int Unfreeze()
@@ -697,10 +681,6 @@ static int Unfreeze()
    S9xFixCycles();  // also not needed?
 #endif
    S9xReschedule();
-#ifdef ZSNES_FX
-   if (Settings.SuperFX)
-      S9xSuperFXPostLoadState();
-#endif
 
    S9xSRTCPostLoadState();
    if (Settings.SDD1)  S9xSDD1PostLoadState();