1 files changed, 6 insertions, 12 deletions
diff --git a/source/globals.c b/source/globals.c
index 830c6ab..36d0e67 100644
--- a/source/globals.c
+++ b/source/globals.c
@@ -17,7 +17,6 @@
 char String[513];
 
 SICPU ICPU;
-
 SCPUState CPU;
 
 #ifndef USE_BLARGG_APU
@@ -27,9 +26,7 @@ SSoundData SoundData;
 #endif
 
 SSettings Settings;
-
 SDSP1 DSP1;
-
 SSA1 SA1;
 
 SnesModel M1SNES = {1, 3, 2};
@@ -40,8 +37,6 @@ int32_t OpAddress = 0;
 
 CMemory Memory;
 
-SSNESGameFixes SNESGameFixes;
-
 uint8_t OpenBus = 0;
 
 FxInit_s SuperFX;
@@ -191,15 +186,14 @@ uint32_t TailMask [5] =
 
 uint8_t APUROM [64] =
 {
-   0xCD, 0xEF, 0xBD, 0xE8, 0x00, 0xC6, 0x1D, 0xD0, 0xFC, 0x8F, 0xAA, 0xF4, 0x8F,
-   0xBB, 0xF5, 0x78, 0xCC, 0xF4, 0xD0, 0xFB, 0x2F, 0x19, 0xEB, 0xF4, 0xD0, 0xFC,
-   0x7E, 0xF4, 0xD0, 0x0B, 0xE4, 0xF5, 0xCB, 0xF4, 0xD7, 0x00, 0xFC, 0xD0, 0xF3,
-   0xAB, 0x01, 0x10, 0xEF, 0x7E, 0xF4, 0x10, 0xEB, 0xBA, 0xF6, 0xDA, 0x00, 0xBA,
-   0xF4, 0xC4, 0xF4, 0xDD, 0x5D, 0xD0, 0xDB, 0x1F, 0x00, 0x00, 0xC0, 0xFF
+   0xCD, 0xEF, 0xBD, 0xE8, 0x00, 0xC6, 0x1D, 0xD0, 0xFC, 0x8F, 0xAA, 0xF4, 0x8F, 0xBB, 0xF5, 0x78,
+   0xCC, 0xF4, 0xD0, 0xFB, 0x2F, 0x19, 0xEB, 0xF4, 0xD0, 0xFC, 0x7E, 0xF4, 0xD0, 0x0B, 0xE4, 0xF5,
+   0xCB, 0xF4, 0xD7, 0x00, 0xFC, 0xD0, 0xF3, 0xAB, 0x01, 0x10, 0xEF, 0x7E, 0xF4, 0x10, 0xEB, 0xBA,
+   0xF6, 0xDA, 0x00, 0xBA, 0xF4, 0xC4, 0xF4, 0xDD, 0x5D, 0xD0, 0xDB, 0x1F, 0x00, 0x00, 0xC0, 0xFF
 };
 
 // Raw SPC700 instruction cycle lengths
-uint16_t S9xAPUCycleLengths [256] =
+uint8_t S9xAPUCycleLengths [256] =
 {
    /*        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e,  f, */
    /* 00 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 4, 6,  8,
@@ -222,7 +216,7 @@ uint16_t S9xAPUCycleLengths [256] =
 
 // Actual data used by CPU emulation, will be scaled by APUReset routine
 // to be relative to the 65c816 instruction lengths.
-uint16_t S9xAPUCycles [256] =
+uint8_t S9xAPUCycles [256] =
 {
    /*        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e,  f, */
    /* 00 */  2, 8, 4, 5, 3, 4, 3, 6, 2, 6, 5, 4, 5, 4, 6,  8,