From e7a82c4ded3047e205221ecec480b08a7a67bb39 Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Mon, 13 Oct 2014 18:24:35 -0400 Subject: [PATCH] Renamed EuRGB60 to PAL60 --- Data/Sys/GameSettings/R3ME01.ini | 2 +- Data/Sys/GameSettings/R3MP01.ini | 2 +- Data/Sys/GameSettings/R7PE01.ini | 2 +- Data/Sys/GameSettings/R96EAF.ini | 2 +- Data/Sys/GameSettings/SNCE8P.ini | 2 +- Data/Sys/GameSettings/SNCJ8P.ini | 2 +- Data/Sys/GameSettings/SNCP8P.ini | 2 +- Data/Sys/GameSettings/WC6EUP.ini | 2 +- Data/Sys/GameSettings/WPCE01.ini | 2 +- Source/Core/Core/HW/VideoInterface.h | 2 +- Source/Core/DolphinWX/ConfigMain.cpp | 10 +++++----- Source/Core/DolphinWX/ConfigMain.h | 2 +- Source/Core/VideoCommon/AVIDump.cpp | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Data/Sys/GameSettings/R3ME01.ini b/Data/Sys/GameSettings/R3ME01.ini index b7e4af0f4d..a9006f9936 100644 --- a/Data/Sys/GameSettings/R3ME01.ini +++ b/Data/Sys/GameSettings/R3ME01.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +EmulationIssues = Disable PAL60 (EuRGB60) to avoid a black bar appearing. [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/R3MP01.ini b/Data/Sys/GameSettings/R3MP01.ini index df74eae201..755355c2d1 100644 --- a/Data/Sys/GameSettings/R3MP01.ini +++ b/Data/Sys/GameSettings/R3MP01.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable EuRGB60(PAL60) to avoid a black bar appearing. +EmulationIssues = Disable PAL60 (EuRGB60) to avoid a black bar appearing. [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/R7PE01.ini b/Data/Sys/GameSettings/R7PE01.ini index 55e049a612..574c43ede6 100644 --- a/Data/Sys/GameSettings/R7PE01.ini +++ b/Data/Sys/GameSettings/R7PE01.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration tab for the game to run +EmulationIssues = Disable "Use PAL60 (EuRGB60) mode" in the wii configuration tab for the game to run [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/R96EAF.ini b/Data/Sys/GameSettings/R96EAF.ini index 8afd1bab3f..c9ef4aae15 100644 --- a/Data/Sys/GameSettings/R96EAF.ini +++ b/Data/Sys/GameSettings/R96EAF.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 5 -EmulationIssues = Disable use EuRGB60 mode in general settings-> wii tab for the game to run (r7446) +EmulationIssues = Disable PAL60 (EuRGB60) mode in general settings-> wii tab for the game to run (r7446) [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/SNCE8P.ini b/Data/Sys/GameSettings/SNCE8P.ini index 9bcc3be420..69212b2c2d 100644 --- a/Data/Sys/GameSettings/SNCE8P.ini +++ b/Data/Sys/GameSettings/SNCE8P.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level. +EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level. EmulationStateId = 5 [OnLoad] diff --git a/Data/Sys/GameSettings/SNCJ8P.ini b/Data/Sys/GameSettings/SNCJ8P.ini index 30516fd356..b4f8237443 100644 --- a/Data/Sys/GameSettings/SNCJ8P.ini +++ b/Data/Sys/GameSettings/SNCJ8P.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level. +EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level. EmulationStateId = 5 [OnLoad] diff --git a/Data/Sys/GameSettings/SNCP8P.ini b/Data/Sys/GameSettings/SNCP8P.ini index 1f54a916e0..ec16ea3fe9 100644 --- a/Data/Sys/GameSettings/SNCP8P.ini +++ b/Data/Sys/GameSettings/SNCP8P.ini @@ -5,7 +5,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. -EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use EuRGB60 mode" for proper brightness level. +EmulationIssues = Integral efb scale has less graphical glitches. Enable "Use PAL60 (EuRGB60) mode" for proper brightness level. EmulationStateId = 5 [OnLoad] diff --git a/Data/Sys/GameSettings/WC6EUP.ini b/Data/Sys/GameSettings/WC6EUP.ini index 30260bcccf..241d502123 100644 --- a/Data/Sys/GameSettings/WC6EUP.ini +++ b/Data/Sys/GameSettings/WC6EUP.ini @@ -6,7 +6,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable EuRGB60 mode +EmulationIssues = Disable PAL60 (EuRGB60) mode [OnLoad] # Add memory patches to be loaded once on boot here. diff --git a/Data/Sys/GameSettings/WPCE01.ini b/Data/Sys/GameSettings/WPCE01.ini index 632a6849a1..4a3e65fd4f 100644 --- a/Data/Sys/GameSettings/WPCE01.ini +++ b/Data/Sys/GameSettings/WPCE01.ini @@ -4,7 +4,7 @@ [EmuState] # The Emulation State. 1 is worst, 5 is best, 0 is not set. EmulationStateId = 4 -EmulationIssues = Disable EuRGB60 mode +EmulationIssues = Disable PAL60 (EuRGB60) mode [OnLoad] # Add memory patches to be loaded once on boot here. [OnFrame] diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h index daf068f3fc..78b966658c 100644 --- a/Source/Core/Core/HW/VideoInterface.h +++ b/Source/Core/Core/HW/VideoInterface.h @@ -21,7 +21,7 @@ namespace VideoInterface #define NTSC_LINE_COUNT 525 // These line numbers indicate the beginning of the "active video" in a frame. // An NTSC frame has the lower field first followed by the upper field. -// TODO: Is this true for PAL-M? Is this true for EURGB60? +// TODO: Is this true for PAL-M? Is this true for PAL60? #define NTSC_LOWER_BEGIN 21 #define NTSC_UPPER_BEGIN 283 diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 835d6f6a8a..96c29f2d87 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -250,7 +250,7 @@ void CConfigMain::UpdateGUI() // Disable stuff on WiiPage WiiScreenSaver->Disable(); - WiiEuRGB60->Disable(); + WiiPAL60->Disable(); WiiAspectRatio->Disable(); WiiSystemLang->Disable(); @@ -490,7 +490,7 @@ void CConfigMain::InitializeGUIValues() // Wii - Misc WiiScreenSaver->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData("IPL.SSV")); - WiiEuRGB60->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData("IPL.E60")); + WiiPAL60->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData("IPL.E60")); WiiAspectRatio->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData("IPL.AR")); WiiSystemLang->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData("IPL.LNG")); @@ -782,7 +782,7 @@ void CConfigMain::CreateGUIControls() // Wii page // Misc Settings WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, _("Enable Screen Saver")); - WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use EuRGB60 Mode (PAL60)")); + WiiPAL60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, _("Use PAL60 Mode (EuRGB60)")); WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio); WiiSystemLang = new wxChoice(WiiPage, ID_WII_IPL_LNG, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiSystemLang); @@ -793,7 +793,7 @@ void CConfigMain::CreateGUIControls() // Populate the Wii Page sWiiIPLSettings = new wxGridBagSizer(); sWiiIPLSettings->Add(WiiScreenSaver, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5); - sWiiIPLSettings->Add(WiiEuRGB60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5); + sWiiIPLSettings->Add(WiiPAL60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5); sWiiIPLSettings->Add(TEXT_BOX(WiiPage, _("Aspect Ratio:")), wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); sWiiIPLSettings->Add(WiiAspectRatio, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5); @@ -1203,7 +1203,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_SYSCONF->SetData("IPL.SSV", WiiScreenSaver->IsChecked()); break; case ID_WII_IPL_E60: - SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", WiiEuRGB60->IsChecked()); + SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", WiiPAL60->IsChecked()); break; case ID_WII_IPL_AR: SConfig::GetInstance().m_SYSCONF->SetData("IPL.AR", WiiAspectRatio->GetSelection()); diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index 02791a1c74..23cd4714f0 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -195,7 +195,7 @@ private: // Misc wxCheckBox* WiiScreenSaver; - wxCheckBox* WiiEuRGB60; + wxCheckBox* WiiPAL60; wxChoice* WiiAspectRatio; wxChoice* WiiSystemLang; diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index 3a291c9353..1dcbbe4d9c 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -28,7 +28,7 @@ #include #include -#include "Core/ConfigManager.h" // for EuRGB60 +#include "Core/ConfigManager.h" // for PAL60 #include "Core/CoreTiming.h" static HWND s_emu_wnd;