diff --git a/Data/Sys/GameSettings/GBSE8P.ini b/Data/Sys/GameSettings/GBSE8P.ini index 340e6837af..1c7e346d8f 100644 --- a/Data/Sys/GameSettings/GBSE8P.ini +++ b/Data/Sys/GameSettings/GBSE8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GBSP8P.ini b/Data/Sys/GameSettings/GBSP8P.ini index 3200c4715d..6bbdbbfba3 100644 --- a/Data/Sys/GameSettings/GBSP8P.ini +++ b/Data/Sys/GameSettings/GBSP8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GF7E01.ini b/Data/Sys/GameSettings/GF7E01.ini index 6a4e1e7dcc..9cfb0b8ea7 100644 --- a/Data/Sys/GameSettings/GF7E01.ini +++ b/Data/Sys/GameSettings/GF7E01.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GF7P01.ini b/Data/Sys/GameSettings/GF7P01.ini index 5da4d712e3..9f753be6a8 100644 --- a/Data/Sys/GameSettings/GF7P01.ini +++ b/Data/Sys/GameSettings/GF7P01.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GFZE01.ini b/Data/Sys/GameSettings/GFZE01.ini index 008d1edea9..ef5ee26473 100644 --- a/Data/Sys/GameSettings/GFZE01.ini +++ b/Data/Sys/GameSettings/GFZE01.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GFZJ01.ini b/Data/Sys/GameSettings/GFZJ01.ini index f4d4fa16e1..699aeb8efc 100644 --- a/Data/Sys/GameSettings/GFZJ01.ini +++ b/Data/Sys/GameSettings/GFZJ01.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GFZP01.ini b/Data/Sys/GameSettings/GFZP01.ini index 274c7e1a74..89d9b7833a 100644 --- a/Data/Sys/GameSettings/GFZP01.ini +++ b/Data/Sys/GameSettings/GFZP01.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GM2E8P.ini b/Data/Sys/GameSettings/GM2E8P.ini index aa76a5427f..f30e42467e 100644 --- a/Data/Sys/GameSettings/GM2E8P.ini +++ b/Data/Sys/GameSettings/GM2E8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GM2J8P.ini b/Data/Sys/GameSettings/GM2J8P.ini index 99432eaaee..c91f184801 100644 --- a/Data/Sys/GameSettings/GM2J8P.ini +++ b/Data/Sys/GameSettings/GM2J8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GM2P8P.ini b/Data/Sys/GameSettings/GM2P8P.ini index 7aeb75405f..20f56a849c 100644 --- a/Data/Sys/GameSettings/GM2P8P.ini +++ b/Data/Sys/GameSettings/GM2P8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GMBE8P.ini b/Data/Sys/GameSettings/GMBE8P.ini index c9c0ce1ea5..735c212231 100644 --- a/Data/Sys/GameSettings/GMBE8P.ini +++ b/Data/Sys/GameSettings/GMBE8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/GMBJ8P.ini b/Data/Sys/GameSettings/GMBJ8P.ini index 90c7c8eb00..73d5dcddcd 100644 --- a/Data/Sys/GameSettings/GMBJ8P.ini +++ b/Data/Sys/GameSettings/GMBJ8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/GMBP8P.ini b/Data/Sys/GameSettings/GMBP8P.ini index f528896d77..21c3140ade 100644 --- a/Data/Sys/GameSettings/GMBP8P.ini +++ b/Data/Sys/GameSettings/GMBP8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True # Values set here will override the main dolphin settings. [EmuState] diff --git a/Data/Sys/GameSettings/GVSE8P.ini b/Data/Sys/GameSettings/GVSE8P.ini index d21cb22d02..2ba4f8c31f 100644 --- a/Data/Sys/GameSettings/GVSE8P.ini +++ b/Data/Sys/GameSettings/GVSE8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/GVSP8P.ini b/Data/Sys/GameSettings/GVSP8P.ini index 5830f4a2a0..7766be8fb9 100644 --- a/Data/Sys/GameSettings/GVSP8P.ini +++ b/Data/Sys/GameSettings/GVSP8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/JACP01.ini b/Data/Sys/GameSettings/JACP01.ini index a7b52cb5b7..4bded5dfc0 100644 --- a/Data/Sys/GameSettings/JACP01.ini +++ b/Data/Sys/GameSettings/JACP01.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/RSME8P.ini b/Data/Sys/GameSettings/RSME8P.ini index 9d09dbf381..9c4ecb6a12 100644 --- a/Data/Sys/GameSettings/RSME8P.ini +++ b/Data/Sys/GameSettings/RSME8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/RSMJ8P.ini b/Data/Sys/GameSettings/RSMJ8P.ini index 8b0a49e473..898dfe57d4 100644 --- a/Data/Sys/GameSettings/RSMJ8P.ini +++ b/Data/Sys/GameSettings/RSMJ8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/RSMP8P.ini b/Data/Sys/GameSettings/RSMP8P.ini index e9f29a4667..f8fadf4e87 100644 --- a/Data/Sys/GameSettings/RSMP8P.ini +++ b/Data/Sys/GameSettings/RSMP8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF = True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/SMBE8P.ini b/Data/Sys/GameSettings/SMBE8P.ini index 13701d64b5..ede0554051 100644 --- a/Data/Sys/GameSettings/SMBE8P.ini +++ b/Data/Sys/GameSettings/SMBE8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Data/Sys/GameSettings/SMBP8P.ini b/Data/Sys/GameSettings/SMBP8P.ini index 2ce0ed56f8..7069544b79 100644 --- a/Data/Sys/GameSettings/SMBP8P.ini +++ b/Data/Sys/GameSettings/SMBP8P.ini @@ -2,7 +2,7 @@ [Core] # Values set here will override the main dolphin settings. -EnableFPRF=True +FPRF = True [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index a43eada9b4..d610c29ccb 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -393,6 +393,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) BAT->SetToolTip(_("Enables Block Address Translation, needed for a few games. Requires MMU. (ON = Compatible, OFF = Fast)")); DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ")); DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled.")); + FPRF = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable FPRF"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FPRF")); + FPRF->SetToolTip(_("Enables Floating Point Result Flag calculation, needed for a few games. (ON = Compatible, OFF = Fast)")); VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam")); VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)")); SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU")); @@ -424,6 +426,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbCoreOverrides->Add(BAT, 0, wxLEFT, 5); sbCoreOverrides->Add(MMU, 0, wxLEFT, 5); sbCoreOverrides->Add(DCBZOFF, 0, wxLEFT, 5); + sbCoreOverrides->Add(FPRF, 0, wxLEFT, 5); sbCoreOverrides->Add(VBeam, 0, wxLEFT, 5); sbCoreOverrides->Add(SyncGPU, 0, wxLEFT, 5); sbCoreOverrides->Add(FastDiscSpeed, 0, wxLEFT, 5); @@ -1007,6 +1010,7 @@ void CISOProperties::LoadGameConfig() SetCheckboxValueFromGameini("Core", "MMU", MMU); SetCheckboxValueFromGameini("Core", "BAT", BAT); SetCheckboxValueFromGameini("Core", "DCBZ", DCBZOFF); + SetCheckboxValueFromGameini("Core", "FPRF", FPRF); SetCheckboxValueFromGameini("Core", "VBeam", VBeam); SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU); SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed); @@ -1081,6 +1085,7 @@ bool CISOProperties::SaveGameConfig() SaveGameIniValueFrom3StateCheckbox("Core", "MMU", MMU); SaveGameIniValueFrom3StateCheckbox("Core", "BAT", BAT); SaveGameIniValueFrom3StateCheckbox("Core", "DCBZ", DCBZOFF); + SaveGameIniValueFrom3StateCheckbox("Core", "FPRF", FPRF); SaveGameIniValueFrom3StateCheckbox("Core", "VBeam", VBeam); SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU); SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed); diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 8112146136..acc7692a68 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -67,7 +67,7 @@ private: DECLARE_EVENT_TABLE(); // Core - wxCheckBox *CPUThread, *SkipIdle, *MMU, *BAT, *DCBZOFF; + wxCheckBox *CPUThread, *SkipIdle, *MMU, *BAT, *DCBZOFF, *FPRF; wxCheckBox *VBeam, *SyncGPU, *FastDiscSpeed, *BlockMerging, *DSPHLE; // Wii wxCheckBox *EnableWideScreen;