diff --git a/pcsx2/CDVD.c b/pcsx2/CDVD.c index da2a61702d..86aa8c5319 100644 --- a/pcsx2/CDVD.c +++ b/pcsx2/CDVD.c @@ -1225,16 +1225,17 @@ void cdvdWrite04(u8 rt) { // NCOMMAND if (cdvd.Param[8] == 0) cdvd.RetryCnt = 0x100; else cdvd.RetryCnt = cdvd.Param[8]; cdvd.SpindlCtrl = cdvd.Param[9]; - if (CHECK_SLOWDVD) { - switch (cdvd.Param[9]) { - case 0x01: cdvd.Speed = 1; break; // CD - case 0x02: cdvd.Speed = 2; break; // CD - case 0x03: cdvd.Speed = 4; break; // CD - case 0x04: cdvd.Speed = 12; break; // CD - default: cdvd.Speed = 24; break; // CD - } - } - else cdvd.Speed = 24; // Fast cd reads; better performance + //if (CHECK_SLOWDVD) { + // switch (cdvd.Param[9]) { + // case 0x01: cdvd.Speed = 1; break; // CD + // case 0x02: cdvd.Speed = 2; break; // CD + // case 0x03: cdvd.Speed = 4; break; // CD + // case 0x04: cdvd.Speed = 12; break; // CD + // default: cdvd.Speed = 24; break; // CD + // } + //} + //else cdvd.Speed = 24; // Fast cd reads; better performance + cdvd.Speed = 24; switch (cdvd.Param[10]) { case 2: cdvd.ReadMode = CDVD_MODE_2340; cdvd.BlockSize = 2340; break; case 1: cdvd.ReadMode = CDVD_MODE_2328; cdvd.BlockSize = 2328; break; @@ -1286,7 +1287,8 @@ void cdvdWrite04(u8 rt) { // NCOMMAND if (cdvd.Param[8] == 0) cdvd.RetryCnt = 0x100; else cdvd.RetryCnt = cdvd.Param[8]; cdvd.SpindlCtrl = cdvd.Param[9]; - cdvd.Speed = CHECK_SLOWDVD ? 1 : 4; //Some games need to read slower + //cdvd.Speed = CHECK_SLOWDVD ? 1 : 4; //Some games need to read slower + cdvd.Speed = 4; cdvd.ReadMode = CDVD_MODE_2048; cdvd.BlockSize = 2064; // Why oh why was it 2064 cdvdReadTimeRcnt(0); diff --git a/pcsx2/Misc.h b/pcsx2/Misc.h index cf5ec48b56..c0bc0cc7dd 100644 --- a/pcsx2/Misc.h +++ b/pcsx2/Misc.h @@ -82,7 +82,7 @@ void CombinePaths( char* dest, const char* srcPath, const char* srcFile ); #define CHECK_FPU_EXTRA_FLAGS (!(Config.Hacks & 0x200)) // Sets correct flags in the FPU recs #define CHECK_ESCAPE_HACK (Config.Hacks & 0x400) //------------ SPECIAL GAME FIXES!!! --------------- -#define CHECK_SLOWDVD (Config.GameFixes & 0x1) // Slow DVD access times, for games that are strict about them (Tales of the Abyss) +//#define CHECK_SLOWDVD (Config.GameFixes & 0x1) // Slow DVD access times, for games that are strict about them (Tales of the Abyss) #define CHECK_FPUCLAMPHACK (Config.GameFixes & 0x4) // Special Fix for Tekken 5, different clamping for FPU (sets NaN to zero; doesn't clamp infinities) #define CHECK_VUCLIPHACK (Config.GameFixes & 0x2) // Special Fix for GoW, updates the clipflag differently in recVUMI_CLIP() (note: turning this hack on, breaks Rockstar games) #define CHECK_VUBRANCHHACK (Config.GameFixes & 0x8) // Special Fix for Magna Carta (note: Breaks Crash Bandicoot) diff --git a/pcsx2/PsxCounters.c b/pcsx2/PsxCounters.c index f929d15104..5dce9db3a3 100644 --- a/pcsx2/PsxCounters.c +++ b/pcsx2/PsxCounters.c @@ -104,7 +104,8 @@ void psxRcntInit() { if (SPU2async != NULL) { - psxCounters[6].rate = ((Config.Hacks & 0x4) ? 768 : (768*12)); + //psxCounters[6].rate = ((Config.Hacks & 0x4) ? 768 : (768*12)); //spu2async hack + psxCounters[6].rate = 768*12; psxCounters[6].CycleT = psxCounters[6].rate; psxCounters[6].mode = 0x8; } @@ -733,7 +734,8 @@ int psxRcntFreeze(gzFile f, int Mode) { // This is needed to make old save states compatible. - psxCounters[6].rate = ((Config.Hacks & 0x4) ? 768 : (768*12)); + //psxCounters[6].rate = ((Config.Hacks & 0x4) ? 768 : (768*12)); //spu2async hack + psxCounters[6].rate = 768*12; psxCounters[6].CycleT = psxCounters[6].rate; psxCounters[7].rate = PSXCLK/1000; psxCounters[7].CycleT = psxCounters[7].rate; diff --git a/pcsx2/windows/WinMain.c b/pcsx2/windows/WinMain.c index 19696cf47d..79963990e0 100644 --- a/pcsx2/windows/WinMain.c +++ b/pcsx2/windows/WinMain.c @@ -892,7 +892,7 @@ BOOL APIENTRY GameFixes(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { case WM_INITDIALOG: SetWindowText(hDlg, _("Game Specific Fixes")); - if(Config.GameFixes & 0x1) CheckDlgButton(hDlg, IDC_GAMEFIX1, TRUE); + //if(Config.GameFixes & 0x1) CheckDlgButton(hDlg, IDC_GAMEFIX1, TRUE); //slow dvd if(Config.GameFixes & 0x2) CheckDlgButton(hDlg, IDC_GAMEFIX2, TRUE); if(Config.GameFixes & 0x4) CheckDlgButton(hDlg, IDC_GAMEFIX3, TRUE); if(Config.GameFixes & 0x8) CheckDlgButton(hDlg, IDC_GAMEFIX4, TRUE); @@ -902,7 +902,7 @@ BOOL APIENTRY GameFixes(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) if (LOWORD(wParam) == IDOK) { Config.GameFixes = 0; - Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX1) ? 0x1 : 0; + //Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX1) ? 0x1 : 0; //slow dvd Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX2) ? 0x2 : 0; Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX3) ? 0x4 : 0; Config.GameFixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX4) ? 0x8 : 0; @@ -924,7 +924,7 @@ static void HacksInit( HWND hDlg ) { if(Config.Hacks & 0x1) CheckDlgButton(hDlg, IDC_SYNCHACK, TRUE); if(Config.Hacks & 0x2) CheckDlgButton(hDlg, IDC_VU_OVERFLOWHACK, TRUE); - if(Config.Hacks & 0x4) CheckDlgButton(hDlg, IDC_SOUNDHACK, TRUE); + //if(Config.Hacks & 0x4) CheckDlgButton(hDlg, IDC_SOUNDHACK, TRUE); if(Config.Hacks & 0x8) CheckDlgButton(hDlg, IDC_DENORMALS, TRUE); if(Config.Hacks & 0x10) CheckDlgButton(hDlg, IDC_SYNCHACK2, TRUE); if(Config.Hacks & 0x20) CheckDlgButton(hDlg, IDC_SYNCHACK3, TRUE); @@ -942,7 +942,7 @@ static void HacksChecked( HWND hDlg ) Config.Hacks |= IsDlgButtonChecked(hDlg, IDC_SYNCHACK) ? 0x1 : 0; /* 0x40 == greyed checkbox (extra overflow checking); 0x2 == checked (disable overflow checking) */ Config.Hacks |= ( IsDlgButtonChecked(hDlg, IDC_VU_OVERFLOWHACK) == 2 ) ? 0x40 : (IsDlgButtonChecked(hDlg, IDC_VU_OVERFLOWHACK) ? 0x2 : 0); - Config.Hacks |= IsDlgButtonChecked(hDlg, IDC_SOUNDHACK) ? 0x4 : 0; + //Config.Hacks |= IsDlgButtonChecked(hDlg, IDC_SOUNDHACK) ? 0x4 : 0; Config.Hacks |= IsDlgButtonChecked(hDlg, IDC_DENORMALS) ? 0x8 : 0; Config.Hacks |= IsDlgButtonChecked(hDlg, IDC_SYNCHACK2) ? 0x10 : 0; Config.Hacks |= IsDlgButtonChecked(hDlg, IDC_SYNCHACK3) ? 0x20 : 0; @@ -997,7 +997,7 @@ BOOL APIENTRY HacksProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) CheckDlgButton(hDlg, IDC_SYNCHACK, TRUE); CheckDlgButton(hDlg, IDC_SYNCHACK2, TRUE); CheckDlgButton(hDlg, IDC_SYNCHACK3, FALSE); - CheckDlgButton(hDlg, IDC_SOUNDHACK, FALSE); + //CheckDlgButton(hDlg, IDC_SOUNDHACK, FALSE); //CheckDlgButton(hDlg, IDC_ESCHACK, TRUE); HacksChecked( hDlg ); diff --git a/pcsx2/windows/pcsx2.rc b/pcsx2/windows/pcsx2.rc index 224c605b8c..3772c9cfc2 100644 --- a/pcsx2/windows/pcsx2.rc +++ b/pcsx2/windows/pcsx2.rc @@ -88,8 +88,8 @@ BEGIN GROUPBOX "PCSX2 Gamefixes",IDC_STATIC,6,30,294,112 CONTROL "FPU Clamp Hack - Special fix for Tekken 5 and maybe other games.",IDC_GAMEFIX3, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,58,253,10 - CONTROL "Slow DVD access (fixes Tales of the Abyss)",IDC_GAMEFIX1, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,44,252,10 + CONTROL "Slow DVD access (fixes Tales of the Abyss) (Not needed at this time)",IDC_GAMEFIX1, + "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,44,252,10 CONTROL "VU Branch Hack - Special fix for Magna Carta; Breaks Crash Bandicoot!",IDC_GAMEFIX4, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,84,252,10 END @@ -1053,7 +1053,7 @@ BEGIN "Button",BS_AUTO3STATE | WS_TABSTOP,15,49,475,10 CTEXT "These hacks will affect the speed of PCSX2 but possibly compromise compatibility.",IDC_HACKDESC,7,7,497,8 CONTROL "Tighter SPU2 Sync ( Try this if you have stuttering audio ) - a bit slower",IDC_SOUNDHACK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,421,10 + "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,15,230,421,10 CONTROL "IOP Sync Hack (x2) - Doubles the cycle rate of the IOP. ( Speedup but breaks some games. )",IDC_SYNCHACK2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,176,410,10 CONTROL "EE/IOP Sync Hack (x3) - Makes EE and IOP hacks triple the cycle rate. ( Even faster, but very unstable. Use at your own risk! )",IDC_SYNCHACK3,