diff --git a/Source/Core/CPU.cpp b/Source/Core/CPU.cpp index f3b89823..04b8dff2 100644 --- a/Source/Core/CPU.cpp +++ b/Source/Core/CPU.cpp @@ -63,21 +63,21 @@ extern void R4300_Init(); // New dynarec engine // #ifdef DAEDALUS_PROFILE_EXECUTION -u64 gTotalInstructionsExecuted = 0; -u64 gTotalInstructionsEmulated = 0; +u64 gTotalInstructionsExecuted {0}; +u64 gTotalInstructionsEmulated {0}; #endif #ifdef DAEDALUS_BREAKPOINTS_ENABLED std::vector< DBG_BreakPoint > g_BreakPoints; #endif -volatile u32 eventQueueLocked = 0; +volatile u32 eventQueueLocked {0}; -static bool gCPURunning = false; // CPU is actively running -u8 * gLastAddress = NULL; +static bool gCPURunning {false}; // CPU is actively running +u8 * gLastAddress {NULL}; std::string gSaveStateFilename = ""; -static bool gCPUStopOnSimpleState = false; // When stopping, try to stop in a 'simple' state (i.e. no RSP running and not in a branch delay slot) +static bool gCPUStopOnSimpleState {false}; // When stopping, try to stop in a 'simple' state (i.e. no RSP running and not in a branch delay slot) static Mutex gSaveStateMutex; enum ESaveStateOperation @@ -87,11 +87,11 @@ enum ESaveStateOperation SSO_LOAD, }; -static ESaveStateOperation gSaveStateOperation = SSO_NONE; +static ESaveStateOperation gSaveStateOperation {SSO_NONE}; -const u32 kInitialVIInterruptCycles = 62500; -static u32 gVerticalInterrupts = 0; -static u32 VI_INTR_CYCLES = kInitialVIInterruptCycles; +const u32 kInitialVIInterruptCycles {62500}; +static u32 gVerticalInterrupts {0}; +static u32 VI_INTR_CYCLES {kInitialVIInterruptCycles}; #ifdef USE_SCRATCH_PAD SCPUState *gPtrCPUState = (SCPUState*)0x10000; diff --git a/Source/Core/ROM.cpp b/Source/Core/ROM.cpp index 652f7684..8ab35492 100644 --- a/Source/Core/ROM.cpp +++ b/Source/Core/ROM.cpp @@ -366,9 +366,9 @@ void SpecificGameHacks( const ROMHeader & id ) case 0x5647: // Glover g_ROM.SET_ROUND_MODE = true; break; - case 0x4B42: //Banjo-Kazooie - g_ROM.TLUT_HACK = true; - g_ROM.DISABLE_LBU_OPT = true; +// case 0x4B42: //Banjo-Kazooie +// g_ROM.TLUT_HACK = true; +// g_ROM.DISABLE_LBU_OPT = true; break; //case 0x5750: //PilotWings64 case 0x4450: //Perfect Dark @@ -436,7 +436,11 @@ void SpecificGameHacks( const ROMHeader & id ) g_ROM.GameHacks = ANIMAL_CROSSING; break; case 0x4842: //Body Harvest + g_ROM.GameHacks = BODY_HARVEST; + break; case 0x434E: //Nightmare Creatures + g_ROM.GameHacks = BODY_HARVEST; + break; case 0x5543: //Cruisn' USA g_ROM.GameHacks = BODY_HARVEST; break; diff --git a/Source/Debug/Dump.cpp b/Source/Debug/Dump.cpp index 73ebe7ea..c1b6a245 100644 --- a/Source/Debug/Dump.cpp +++ b/Source/Debug/Dump.cpp @@ -108,13 +108,22 @@ void Dump_GetSaveDirectory(char * rootdir, const char * rom_filename, const char // Form the filename from the file spec (i.e. strip path and replace the extension) IO::Filename file_name; + + +// PSP needs the original setup I believe + #ifdef DAEDALUS_PSP + IO::Path::Assign(file_name, IO::Path::FindFileName(rom_filename)); + IO::Path::SetExtension(file_name, extension); + #else char *romfilebuffer; romfilebuffer = strdup(rom_filename); - IO::Path::Assign(file_name, romfilebuffer + 5); + IO::Path::Assign(file_name, romfilebuffer); IO::Path::SetExtension(file_name, extension); + #endif IO::Path::Combine(rootdir, g_DaedalusConfig.mSaveDir, file_name); + } #ifndef DAEDALUS_SILENT diff --git a/Source/SysPSP/main.cpp b/Source/SysPSP/main.cpp index 01b7728c..98398c51 100644 --- a/Source/SysPSP/main.cpp +++ b/Source/SysPSP/main.cpp @@ -63,7 +63,7 @@ #include "Utility/Profiler.h" #include "Utility/Thread.h" #include "Utility/Timer.h" - +#include "Utility/Translate.h" /* Define to enable Exit Callback */ // Do not enable this, callbacks don't get along with our exit dialog :p @@ -425,9 +425,6 @@ void HandleEndOfFrame() //CVideoMemoryManager::Get()->DisplayDebugInfo(); //#endif - // No longer needed since we save normally now, and not jsut when entering the pause menu ;) - //Save_Flush(true); - // switch back to the LCD display CGraphicsContext::Get()->SwitchToLcdDisplay(); @@ -479,13 +476,6 @@ static void DisplayRomsAndChoose(bool show_splash) if(p_context != NULL) { - // Already set in ClearBackground() @ UIContext.h - //const c32 BACKGROUND_COLOUR = c32( 107, 188, 255 ); // blue - //const c32 BACKGROUND_COLOUR = c32( 92, 162, 219 ); // blue - //const c32 BACKGROUND_COLOUR = c32( 1, 1, 127 ); // dark blue - //const c32 BACKGROUND_COLOUR = c32( 1, 127, 1 ); // dark green - - //p_context->SetBackgroundColour( BACKGROUND_COLOUR ); if( show_splash ) {