diff options
| author | aliaspider | 2014-10-30 06:25:49 +0100 |
|---|---|---|
| committer | aliaspider | 2014-10-30 06:25:49 +0100 |
| commit | 1fbc985d61038c52af8559bbac8ce801d2a1f0b8 (patch) | |
| tree | 7f837cae2946d6da8420618c4214d0b23b9ed7a9 /source/memmap.c | |
| parent | 9d26cad1e39af6e4c96a4efb5ae00332207163ca (diff) | |
| download | snes9x2005-1fbc985d61038c52af8559bbac8ce801d2a1f0b8.tar.gz snes9x2005-1fbc985d61038c52af8559bbac8ce801d2a1f0b8.tar.bz2 snes9x2005-1fbc985d61038c52af8559bbac8ce801d2a1f0b8.zip | |
remove ZSNES_FX defines
Diffstat (limited to 'source/memmap.c')
| -rw-r--r-- | source/memmap.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/memmap.c b/source/memmap.c index e3d474a..0dfeddf 100644 --- a/source/memmap.c +++ b/source/memmap.c @@ -121,12 +121,8 @@ #include <malloc.h> #endif -#ifndef ZSNES_FX #include "fxemu.h" extern struct FxInit_s SuperFX; -#else -extern uint8* SFXPlotTable; -#endif #ifndef SET_UI_COLOR #define SET_UI_COLOR(r,g,b) ; @@ -469,15 +465,11 @@ bool8 Init() Memory.ROM = Memory.ROM; Memory.SRAM = Memory.SRAM; -#ifdef ZSNES_FX - SFXPlotTable = ROM + 0x400000; -#else SuperFX.pvRegisters = &Memory.FillRAM [0x3000]; SuperFX.nRamBanks = 2; // Most only use 1. 1=64KB, 2=128KB=1024Mb SuperFX.pvRam = Memory.SRAM; SuperFX.nRomBanks = (2 * 1024 * 1024) / (32 * 1024); SuperFX.pvRom = (uint8*) Memory.ROM; -#endif ZeroMemory(IPPU.TileCache [TILE_2BIT], MAX_2BIT_TILES * 128); ZeroMemory(IPPU.TileCache [TILE_4BIT], MAX_4BIT_TILES * 128); @@ -1267,9 +1259,7 @@ uint32 caCRC32(uint8* array, uint32 size, register uint32 crc32) void InitROM(bool8 Interleaved) { -#ifndef ZSNES_FX SuperFX.nRomBanks = Memory.CalculatedSize >> 15; -#endif Settings.MultiPlayer5Master = Settings.MultiPlayer5; Settings.MouseMaster = Settings.Mouse; Settings.SuperScopeMaster = Settings.SuperScope; |