Fixed V7/V8 CPUReset(). Some obscure desync problems related to reset now gone.

Fixed v20 GB Frame Timing Hack... though it doesn't seem useful at all.
Fixed menu items of some settings.
And some more minor fixes/adjustments.
TODO: Fix V8 GBA savestate save/load?

Author: aquanull

src/common/SystemGlobals.cpp

@@ -17,36 +17,35 @@ EmulatedSystemCounters systemCounters =
 	true,
 };
 
-int	emulating = 0;
+int emulating = 0;
 
 u8 *bios = NULL;
 u8 *pix	 = NULL;
 
-u16	  currentButtons[4] = { 0, 0, 0, 0 };	// constrain: never contains hacked buttons, only the lower 16 bits of each are used
-u16   lastKeys = 0;
-int32 sensorX = 0;
-int32 sensorY = 0;
+u16	  currentButtons[4] = { 0, 0, 0, 0 };   // constrain: never contains hacked buttons, only the lower 16 bits of each are used
+u16	  lastKeys = 0;
+int32 sensorX  = 0;
+int32 sensorY  = 0;
 
 bool  newFrame		  = true;
 bool8 speedup		  = false;
 u32	  extButtons	  = 0;
 bool8 capturePrevious = false;
 int32 captureNumber	  = 0;
 
-soundtick_t USE_TICKS_AS	= 0;
-soundtick_t soundTickStep	= soundQuality * USE_TICKS_AS;
-soundtick_t soundTicks		= 0;
+soundtick_t USE_TICKS_AS  = 0;
+soundtick_t soundTickStep = soundQuality * USE_TICKS_AS;
+soundtick_t soundTicks	  = 0;
 
-u32	  soundIndex  = 0;
-int32 soundPaused = 1;
-int32 soundPlay	  = 0;
-u32	  soundNextPosition	= 0;
-
-u8	  soundBuffer[6][735];
-u32   soundBufferLen	  = 1470;
-u32	  soundBufferTotalLen = 14700;
-u32	  soundBufferIndex	  = 0;
+u32	  soundIndex		= 0;
+int32 soundPaused		= 1;
+int32 soundPlay			= 0;
+u32	  soundNextPosition = 0;
 
+u8	soundBuffer[6][735];
+u32 soundBufferLen		= 1470;
+u32 soundBufferTotalLen = 14700;
+u32 soundBufferIndex	= 0;
 
 u16	  soundFinalWave[1470];
 u16	  soundFrameSound[735 * 30 * 2]; // for avi logging
@@ -57,37 +56,41 @@ int	 tempSaveID		  = 0;
 int	 tempSaveAttempts = 0;
 
 // settings
-bool8 synchronize	= true;
-int32 gbFrameSkip	= 0;
-int32 frameSkip		= 0;
+bool  synchronize = true;
+int32 gbFrameSkip = 0;
+int32 frameSkip	  = 0;
 
-bool8 cpuDisableSfx = false;
+bool  cpuDisableSfx = false;
 int32 layerSettings = 0xff00;
 
 #ifdef USE_GB_CORE_V7
-bool8 gbNullInputHackEnabled	 = false;
-bool8 gbNullInputHackTempEnabled = false;
+bool gbNullInputHackEnabled		= false;
+bool gbNullInputHackTempEnabled = false;
+#else
+bool gbV20GBFrameTimingHack		= false;
+bool gbV20GBFrameTimingHackTemp = false;
 #endif
 
 #ifdef USE_GBA_CORE_V7
-bool8 memLagEnabled		   = false;
-bool8 memLagTempEnabled	   = false;
+bool memLagEnabled	   = false;
+bool memLagTempEnabled = false;
 #endif
 
-bool8 useOldFrameTiming	   = false;
-bool8 useBios			   = false;
-bool8 skipBios			   = false;
-bool8 skipSaveGameBattery  = false;
-bool8 skipSaveGameCheats   = false;
-bool8 cheatsEnabled		   = true;
-bool8 mirroringEnable	   = false;
+bool8 useOldFrameTiming	  = false;
+bool8 useBios			  = false;
+bool8 skipBios			  = false;
+bool8 skipSaveGameBattery = false;
+bool8 skipSaveGameCheats  = false;
+bool8 cheatsEnabled		  = true;
+bool8 mirroringEnable	  = false;
 
 bool8 cpuEnhancedDetection = true;
 int32 cpuSaveType		   = 0;
 
-int32 soundVolume	= 0;
-int32 soundQuality	= 2;
-bool8 soundEcho		= false;
-bool8 soundLowPass	= false;
-bool8 soundReverse	= false;
-bool8 soundOffFlag	= false;
+int32 soundVolume	  = 0;
+int32 soundQuality	  = 2;
+bool8 soundEcho		  = false;
+bool8 soundLowPass	  = false;
+bool8 soundReverse	  = false;
+int32 soundEnableFlag = 0x3ff;
+bool8 soundOffFlag	  = false;

src/common/SystemGlobals.h

@@ -86,35 +86,39 @@ extern int32 soundPaused;
 extern int32 soundPlay;
 extern u32	 soundNextPosition;
 
-extern u8	 soundBuffer[6][735];
-extern u32	 soundBufferLen;
-extern u32	 soundBufferTotalLen;
-extern u32	 soundBufferIndex;
+extern u8  soundBuffer[6][735];
+extern u32 soundBufferLen;
+extern u32 soundBufferTotalLen;
+extern u32 soundBufferIndex;
 
 extern u16	 soundFinalWave[1470];
 extern u16	 soundFrameSound[735 * 30 * 2];
 extern int32 soundFrameSoundWritten;
 
-extern bool	 tempSaveSafe;
-extern int	 tempSaveID;
-extern int	 tempSaveAttempts;
+extern bool tempSaveSafe;
+extern int	tempSaveID;
+extern int	tempSaveAttempts;
 
-//settings
-extern bool8 synchronize;
+// settings that should have no effect on timing
+extern bool	 synchronize;   // ... except this one?
 extern int32 gbFrameSkip;
 extern int32 frameSkip;
 
-extern bool8 cpuDisableSfx;
+extern bool	 cpuDisableSfx;
 extern int32 layerSettings;
 
+// other settings
 #ifdef USE_GB_CORE_V7
-extern bool8 gbNullInputHackEnabled;
-extern bool8 gbNullInputHackTempEnabled;
+extern bool gbNullInputHackEnabled;
+extern bool gbNullInputHackTempEnabled;
+#else
+extern bool gbV20GBFrameTimingHack;
+extern bool gbV20GBFrameTimingHackTemp;
 #endif
 
 #ifdef USE_GBA_CORE_V7
-extern bool8 memLagEnabled;
-extern bool8 memLagTempEnabled;
+extern bool memLagEnabled;
+extern bool memLagTempEnabled;
 #endif
 
 extern bool8 useOldFrameTiming;
@@ -133,7 +137,7 @@ extern int32 soundQuality;
 extern bool8 soundEcho;
 extern bool8 soundLowPass;
 extern bool8 soundReverse;
-extern bool8 soundOffFlag;
 extern int32 soundEnableFlag;
+extern bool8 soundOffFlag;
 
 #endif