can display some stuff now.

2 files changed, 10 insertions, 8 deletions

diff --git a/Makefile.common b/Makefile.common
index 1aded3e..3098178 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -18,7 +18,6 @@ SOURCES += $(CORE_DIR)/dsp1.c
 SOURCES += $(CORE_DIR)/fxemu.c
 SOURCES += $(CORE_DIR)/fxinst.c
 SOURCES += $(CORE_DIR)/globals.c
-SOURCES += $(CORE_DIR)/ppu.c
 SOURCES += $(CORE_DIR)/dma.c
 SOURCES += $(CORE_DIR)/memmap.c
 SOURCES += $(CORE_DIR)/cpu.c
@@ -40,6 +39,8 @@ ifeq ($(ARM_ASM), 1)
 SOURCES += $(CORE_DIR)/spc700a.s
 SOURCES += $(CORE_DIR)/spc_decode.S
 
+SOURCES += $(CORE_DIR)/ppu.c
+
 SOURCES += $(CORE_DIR)/mode7new.c
 SOURCES += $(CORE_DIR)/mode7.c
 SOURCES += $(CORE_DIR)/mode7add.c
@@ -70,6 +71,7 @@ SOURCES += $(CORE_DIR)/os9x_65c816_spcc.s
 SOURCES += $(CORE_DIR)/os9x_asm_cpu.c
 
 else
+SOURCES += $(CORE_DIR)/ppu_.c
 SOURCES += $(CORE_DIR)/gfx.c
 SOURCES += $(CORE_DIR)/tile.c
 endif
diff --git a/src/ppu_.c b/src/ppu_.c
index deefbb0..4dc1a31 100644
--- a/src/ppu_.c
+++ b/src/ppu_.c
@@ -218,7 +218,7 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
 
       case 0x2104:
          // Sprite register write
-         REGISTER_2104(Byte, &Memory, &IPPU, &PPU);
+         REGISTER_2104(Byte);
 
          break;
 
@@ -405,13 +405,13 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
       case 0x2118:
          // VRAM write data (low)
          IPPU.FirstVRAMRead = TRUE;
-         REGISTER_2118(Byte, &Memory, &IPPU, &PPU);
+         REGISTER_2118(Byte);
          break;
 
       case 0x2119:
          // VRAM write data (high)
          IPPU.FirstVRAMRead = TRUE;
-         REGISTER_2119(Byte, &Memory, &IPPU, &PPU);
+         REGISTER_2119(Byte);
          break;
 
       case 0x211a:
@@ -459,7 +459,7 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
          break;
 
       case 0x2122:
-         REGISTER_2122(Byte, &Memory, &IPPU, &PPU);
+         REGISTER_2122(Byte);
          break;
 
       case 0x2123:
@@ -840,7 +840,7 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
 #endif // SPCTOOL
          break;
       case 0x2180:
-         REGISTER_2180(Byte, &Memory, &IPPU, &PPU);
+         REGISTER_2180(Byte);
          break;
       case 0x2181:
          PPU.WRAM &= 0x1FF00;
@@ -947,7 +947,7 @@ void S9xSetPPU(uint8 Byte, uint16 Address)
             default:
                Memory.FillRAM[Address] = Byte;
                if (Address >= 0x3100)
-                  FxCacheWriteAccess(Address, &GSU);
+                  FxCacheWriteAccess(Address);
                break;
             }
 #endif
@@ -1636,7 +1636,7 @@ void S9xSetCPU(uint8 byte, uint16 Address)
             else
                CPU.FastROMSpeed = SLOW_ONE_CYCLE;
 
-            Memory.FixROMSpeed();
+            FixROMSpeed();
          }
       /* FALL */
       case 0x420e: