From 9df772ed8958b7fa8e9e53d0cf7befa8f9e47d9c Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 3 Nov 2010 06:28:47 +0000 Subject: [PATCH] Make NTSC-J setting an option. This allows games which use Japanese ROM fonts to work correctly. Unfortunately trying to autodetect when to enable this setting is not good enough. Also move Progressive Scan option to main display settings, since it affects both GC and Wii. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6335 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/Boot/Boot.cpp | 2 - Source/Core/Core/Src/ConfigManager.cpp | 2 + Source/Core/Core/Src/CoreParameter.cpp | 2 +- Source/Core/Core/Src/CoreParameter.h | 1 + Source/Core/Core/Src/HW/VideoInterface.cpp | 17 ++--- Source/Core/Core/Src/HW/VideoInterface.h | 13 +++- Source/Core/DolphinWX/Src/ConfigMain.cpp | 88 +++++++++++++--------- Source/Core/DolphinWX/Src/ConfigMain.h | 6 +- 8 files changed, 78 insertions(+), 53 deletions(-) diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp index 1d6e17aad1..c264ecde04 100644 --- a/Source/Core/Core/Src/Boot/Boot.cpp +++ b/Source/Core/Core/Src/Boot/Boot.cpp @@ -188,8 +188,6 @@ bool CBoot::BootUp() // setup the map from ISOFile ID VolumeHandler::SetVolumeName(_StartupPara.m_strFilename); - VideoInterface::SetRegionReg((char)VolumeHandler::GetVolume()->GetUniqueID().at(3)); - DVDInterface::SetDiscInside(VolumeHandler::IsValid()); u32 _TMDsz = 0x208; diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index d611200252..e99619b277 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -122,6 +122,7 @@ void SConfig::SaveSettings() ini.Set("Display", "RenderWindowWidth", m_LocalCoreStartupParameter.iRenderWindowWidth); ini.Set("Display", "RenderWindowHeight", m_LocalCoreStartupParameter.iRenderWindowHeight); ini.Set("Display", "ProgressiveScan", m_LocalCoreStartupParameter.bProgressive); + ini.Set("Display", "NTSCJ", m_LocalCoreStartupParameter.bNTSCJ); // Game List Control ini.Set("GameList", "ListDrives", m_ListDrives); @@ -245,6 +246,7 @@ void SConfig::LoadSettings() ini.Get("Display", "RenderWindowWidth", &m_LocalCoreStartupParameter.iRenderWindowWidth, 640); ini.Get("Display", "RenderWindowHeight", &m_LocalCoreStartupParameter.iRenderWindowHeight, 480); ini.Get("Display", "ProgressiveScan", &m_LocalCoreStartupParameter.bProgressive, false); + ini.Get("Display", "NTSCJ", &m_LocalCoreStartupParameter.bNTSCJ, false); // Game List Control ini.Get("GameList", "ListDrives", &m_ListDrives, false); diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 68f2392252..d91f8a5c47 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -42,7 +42,7 @@ SCoreStartupParameter::SCoreStartupParameter() bJITBranchOff(false), bJITProfiledReJIT(false), bEnableFPRF(false), bCPUThread(true), bDSPThread(false), - bSkipIdle(true), bNTSC(false), + bSkipIdle(true), bNTSC(false), bNTSCJ(false), bHLE_BS2(true), bUseFastMem(false), bLockThreads(false), bEnableCheats(false), diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h index ca7cd6196e..e3da057bb4 100644 --- a/Source/Core/Core/Src/CoreParameter.h +++ b/Source/Core/Core/Src/CoreParameter.h @@ -69,6 +69,7 @@ struct SCoreStartupParameter bool bDSPThread; bool bSkipIdle; bool bNTSC; + bool bNTSCJ; bool bHLE_BS2; bool bEnableOpenCL; bool bUseFastMem; diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 5d0f630575..2ea6b04795 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -54,7 +54,7 @@ static UVIHorizontalScaling m_HorizontalScaling; static SVIFilterCoefTables m_FilterCoefTables; static u32 m_UnkAARegister = 0;// ??? 0x00FF0000 static u16 m_Clock = 0; // 0: 27MHz, 1: 54MHz -static u16 m_DTVStatus = 0; // Region char and component cable bit +static UVIDTVStatus m_DTVStatus; static u16 m_FBWidth = 0; // Only correct when scaling is enabled? static UVIBorderBlankRegister m_BorderHBlank; // 0xcc002076 - 0xcc00207f is full of 0x00FF: unknown @@ -145,21 +145,18 @@ void Preset(bool _bNTSC) m_VBeamPos = 1; // 54MHz, capable of progressive scan - m_Clock = Core::g_CoreStartupParameter.bProgressive?1:0; + m_Clock = Core::g_CoreStartupParameter.bProgressive; // Say component cable is plugged - m_DTVStatus = Core::g_CoreStartupParameter.bProgressive?1:0; + m_DTVStatus.component_plugged = Core::g_CoreStartupParameter.bProgressive; UpdateParameters(); } -void SetRegionReg(char _region) -{ - m_DTVStatus = _region | (m_DTVStatus & 1); -} - void Init() { + m_DTVStatus.ntsc_j = Core::g_CoreStartupParameter.bNTSCJ; + for (int i = 0; i < 4; i++) m_InterruptRegister[i].Hex = 0; @@ -385,7 +382,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress) break; case VI_DTV_STATUS: - _uReturnValue = m_DTVStatus; + _uReturnValue = m_DTVStatus.Hex; break; case VI_FBWIDTH: @@ -637,7 +634,7 @@ void Write16(const u16 _iValue, const u32 _iAddress) break; case VI_DTV_STATUS: - m_DTVStatus = _iValue; + m_DTVStatus.Hex = _iValue; break; case VI_FBWIDTH: diff --git a/Source/Core/Core/Src/HW/VideoInterface.h b/Source/Core/Core/Src/HW/VideoInterface.h index c7c92ae0aa..5d66bf177d 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.h +++ b/Source/Core/Core/Src/HW/VideoInterface.h @@ -315,12 +315,23 @@ union UVIBorderBlankRegister }; }; +// ntsc-j and component cable bits +union UVIDTVStatus +{ + u16 Hex; + struct + { + u16 component_plugged : 1; + u16 ntsc_j : 1; + u16 :14; + }; +}; + // urgh, ugly externs. extern u32 TargetRefreshRate; // For BS2 HLE void Preset(bool _bNTSC); - void SetRegionReg(char _region); void Init(); void DoState(PointerWrap &p); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 83a2d611fb..a1e0cae4a3 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -81,6 +81,8 @@ EVT_TEXT(ID_DISPLAY_WINDOWHEIGHT, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_DISPLAY_FULLSCREEN, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_DISPLAY_HIDECURSOR, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_DISPLAY_RENDERTOMAIN, CConfigMain::DisplaySettingsChanged) +EVT_CHECKBOX(ID_DISPLAY_PROGSCAN, CConfigMain::DisplaySettingsChanged) +EVT_CHECKBOX(ID_DISPLAY_NTSCJ, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_CONFIRMSTOP, CConfigMain::DisplaySettingsChanged) EVT_CHECKBOX(ID_INTERFACE_USEPANICHANDLERS, CConfigMain::DisplaySettingsChanged) @@ -105,7 +107,6 @@ EVT_CHOICE(ID_GC_SIDEVICE3, CConfigMain::GCSettingsChanged) EVT_CHOICE(ID_WII_BT_BAR, CConfigMain::WiiSettingsChanged) EVT_CHECKBOX(ID_WII_IPL_SSV, CConfigMain::WiiSettingsChanged) -EVT_CHECKBOX(ID_WII_IPL_PGS, CConfigMain::WiiSettingsChanged) EVT_CHECKBOX(ID_WII_IPL_E60, CConfigMain::WiiSettingsChanged) EVT_CHOICE(ID_WII_IPL_AR, CConfigMain::WiiSettingsChanged) EVT_CHOICE(ID_WII_IPL_LNG, CConfigMain::WiiSettingsChanged) @@ -183,7 +184,7 @@ void CConfigMain::UpdateGUI() // Disable stuff on WiiPage WiiSensBarPos->Disable(); WiiScreenSaver->Disable(); - WiiProgressiveScan->Disable(); + ProgressiveScan->Disable(); WiiEuRGB60->Disable(); WiiAspectRatio->Disable(); WiiSystemLang->Disable(); @@ -259,41 +260,48 @@ void CConfigMain::InitializeGUILists() void CConfigMain::InitializeGUIValues() { + const SCoreStartupParameter& startup_params = SConfig::GetInstance().m_LocalCoreStartupParameter; + // General - Basic - CPUThread->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread); - SkipIdle->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bSkipIdle); - EnableCheats->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats); + CPUThread->SetValue(startup_params.bCPUThread); + SkipIdle->SetValue(startup_params.bSkipIdle); + EnableCheats->SetValue(startup_params.bEnableCheats); Framelimit->SetSelection(SConfig::GetInstance().m_Framelimit); UseFPSForLimiting->SetValue(SConfig::GetInstance().b_UseFPS); // General - Advanced - AlwaysHLE_BS2->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2); + AlwaysHLE_BS2->SetValue(startup_params.bHLE_BS2); #if defined(HAVE_OPENCL) && HAVE_OPENCL - EnableOpenCL->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableOpenCL); + EnableOpenCL->SetValue(startup_params.bEnableOpenCL); #endif - CPUEngine->SetSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore); - LockThreads->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bLockThreads); - DSPThread->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPThread); + CPUEngine->SetSelection(startup_params.iCPUCore); + LockThreads->SetValue(startup_params.bLockThreads); + DSPThread->SetValue(startup_params.bDSPThread); // Display - Display - FullscreenResolution->SetStringSelection(wxString::FromAscii(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution.c_str())); - WindowWidth->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth); - WindowHeight->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); - Fullscreen->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen); - HideCursor->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bHideCursor); - RenderToMain->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain); + FullscreenResolution->SetStringSelection(wxString::FromAscii(startup_params.strFullscreenResolution.c_str())); + WindowWidth->SetValue(startup_params.iRenderWindowWidth); + WindowHeight->SetValue(startup_params.iRenderWindowHeight); + Fullscreen->SetValue(startup_params.bFullscreen); + HideCursor->SetValue(startup_params.bHideCursor); + RenderToMain->SetValue(startup_params.bRenderToMain); + ProgressiveScan->SetValue(startup_params.bProgressive); + // A bit strange behavior, but this needs to stay in sync with the main progressive boolean + SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", startup_params.bProgressive); + NTSCJ->SetValue(startup_params.bNTSCJ); + // Display - Interface - ConfirmStop->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop); - UsePanicHandlers->SetValue(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers); - Theme->SetSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.iTheme); + ConfirmStop->SetValue(startup_params.bConfirmStop); + UsePanicHandlers->SetValue(startup_params.bUsePanicHandlers); + Theme->SetSelection(startup_params.iTheme); // need redesign InterfaceLang->SetSelection(SConfig::GetInstance().m_InterfaceLanguage); // Gamecube - IPL - GCSystemLang->SetSelection(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); + GCSystemLang->SetSelection(startup_params.SelectedLanguage); // Gamecube - Devices // Not here. They use some locals over in CreateGUIControls for initialization, @@ -305,7 +313,6 @@ void CConfigMain::InitializeGUIValues() // Wii - Misc WiiScreenSaver->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData("IPL.SSV")); - WiiProgressiveScan->SetValue(!!SConfig::GetInstance().m_SYSCONF->GetData("IPL.PGS")); WiiEuRGB60->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")); @@ -317,14 +324,14 @@ void CConfigMain::InitializeGUIValues() // Paths RecursiveISOPath->SetValue(SConfig::GetInstance().m_RecursiveISOFolder); - DefaultISO->SetPath(wxString(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM.c_str(), *wxConvCurrent)); - DVDRoot->SetPath(wxString(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDVDRoot.c_str(), *wxConvCurrent)); - ApploaderPath->SetPath(wxString(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strApploader.c_str(), *wxConvCurrent)); + DefaultISO->SetPath(wxString(startup_params.m_strDefaultGCM.c_str(), *wxConvCurrent)); + DVDRoot->SetPath(wxString(startup_params.m_strDVDRoot.c_str(), *wxConvCurrent)); + ApploaderPath->SetPath(wxString(startup_params.m_strApploader.c_str(), *wxConvCurrent)); // Plugins - FillChoiceBox(GraphicSelection, PLUGIN_TYPE_VIDEO, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin); - FillChoiceBox(DSPSelection, PLUGIN_TYPE_DSP, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin); + FillChoiceBox(GraphicSelection, PLUGIN_TYPE_VIDEO, startup_params.m_strVideoPlugin); + FillChoiceBox(DSPSelection, PLUGIN_TYPE_DSP, startup_params.m_strDSPPlugin); } void CConfigMain::InitializeGUITooltips() @@ -349,6 +356,8 @@ void CConfigMain::InitializeGUITooltips() HideCursor->SetToolTip(wxT("Hide the cursor when it is over the rendering window") wxT("\n and the rendering window has focus.")); RenderToMain->SetToolTip(wxT("Render to main window.")); + ProgressiveScan->SetToolTip(wxT("Will enable progressive scan option if supported by software.")); + NTSCJ->SetToolTip(wxT("Required for using the Japanese ROM font.")); // Display - Interface ConfirmStop->SetToolTip(wxT("Show a confirmation box before stopping a game.")); @@ -457,6 +466,8 @@ void CConfigMain::CreateGUIControls() Fullscreen = new wxCheckBox(DisplayPage, ID_DISPLAY_FULLSCREEN, wxT("Start Renderer in Fullscreen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); HideCursor = new wxCheckBox(DisplayPage, ID_DISPLAY_HIDECURSOR, wxT("Hide Mouse Cursor")); RenderToMain = new wxCheckBox(DisplayPage, ID_DISPLAY_RENDERTOMAIN, wxT("Render to Main Window"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + ProgressiveScan = new wxCheckBox(DisplayPage, ID_DISPLAY_PROGSCAN, wxT("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + NTSCJ = new wxCheckBox(DisplayPage, ID_DISPLAY_NTSCJ, wxT("Set Console as NTSC-J"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); // Interface settings sbInterface = new wxStaticBoxSizer(wxVERTICAL, DisplayPage, wxT("Interface Settings")); @@ -489,6 +500,8 @@ void CConfigMain::CreateGUIControls() sbDisplay->Add(Fullscreen, 0, wxEXPAND | wxALL, 5); sbDisplay->Add(HideCursor, 0, wxALL, 5); sbDisplay->Add(RenderToMain, 0, wxEXPAND | wxALL, 5); + sbDisplay->Add(ProgressiveScan, 0, wxEXPAND | wxALL, 5); + sbDisplay->Add(NTSCJ, 0, wxEXPAND | wxALL, 5); sbInterface->Add(ConfirmStop, 0, wxALL, 5); sbInterface->Add(UsePanicHandlers, 0, wxALL, 5); @@ -640,7 +653,6 @@ void CConfigMain::CreateGUIControls() // Misc Settings sbWiiIPLSettings = new wxStaticBoxSizer(wxVERTICAL, WiiPage, wxT("Misc Settings")); WiiScreenSaver = new wxCheckBox(WiiPage, ID_WII_IPL_SSV, wxT("Enable Screen Saver (burn-in reduction)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - WiiProgressiveScan = new wxCheckBox(WiiPage, ID_WII_IPL_PGS, wxT("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); WiiEuRGB60 = new wxCheckBox(WiiPage, ID_WII_IPL_E60, wxT("Use EuRGB60 Mode (PAL60)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); wxStaticText* WiiAspectRatioText = new wxStaticText(WiiPage, ID_WII_IPL_AR_TEXT, wxT("Aspect Ratio:"), wxDefaultPosition, wxDefaultSize); WiiAspectRatio = new wxChoice(WiiPage, ID_WII_IPL_AR, wxDefaultPosition, wxDefaultSize, arrayStringFor_WiiAspectRatio, 0, wxDefaultValidator); @@ -660,12 +672,11 @@ void CConfigMain::CreateGUIControls() sWiiIPLSettings = new wxGridBagSizer(); sWiiIPLSettings->Add(WiiScreenSaver, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5); - sWiiIPLSettings->Add(WiiProgressiveScan, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5); - sWiiIPLSettings->Add(WiiEuRGB60, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5); - sWiiIPLSettings->Add(WiiAspectRatioText, wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); - sWiiIPLSettings->Add(WiiAspectRatio, wxGBPosition(3, 1), wxDefaultSpan, wxALL, 5); - sWiiIPLSettings->Add(WiiSystemLangText, wxGBPosition(4, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); - sWiiIPLSettings->Add(WiiSystemLang, wxGBPosition(4, 1), wxDefaultSpan, wxALL, 5); + sWiiIPLSettings->Add(WiiEuRGB60, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, 5); + sWiiIPLSettings->Add(WiiAspectRatioText, wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sWiiIPLSettings->Add(WiiAspectRatio, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5); + sWiiIPLSettings->Add(WiiSystemLangText, wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL|wxALL, 5); + sWiiIPLSettings->Add(WiiSystemLang, wxGBPosition(3, 1), wxDefaultSpan, wxALL, 5); sbWiiIPLSettings->Add(sWiiIPLSettings); sbWiiDeviceSettings->Add(WiiSDCard, 0, wxALL, 5); @@ -863,6 +874,13 @@ void CConfigMain::DisplaySettingsChanged(wxCommandEvent& event) case ID_DISPLAY_RENDERTOMAIN: SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain = RenderToMain->IsChecked(); break; + case ID_DISPLAY_PROGSCAN: + SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", ProgressiveScan->IsChecked()); + SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = ProgressiveScan->IsChecked(); + break; + case ID_DISPLAY_NTSCJ: + SConfig::GetInstance().m_LocalCoreStartupParameter.bNTSCJ = NTSCJ->IsChecked(); + break; // Display - Interface case ID_INTERFACE_CONFIRMSTOP: SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop = ConfirmStop->IsChecked(); @@ -1037,10 +1055,6 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event) case ID_WII_IPL_SSV: SConfig::GetInstance().m_SYSCONF->SetData("IPL.SSV", WiiScreenSaver->IsChecked()); break; - case ID_WII_IPL_PGS: - SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", WiiProgressiveScan->IsChecked()); - SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive = WiiProgressiveScan->IsChecked(); - break; case ID_WII_IPL_E60: SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", WiiEuRGB60->IsChecked()); break; diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h index b947b732d4..6e8f4b418d 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.h +++ b/Source/Core/DolphinWX/Src/ConfigMain.h @@ -82,6 +82,8 @@ private: wxCheckBox* Fullscreen; wxCheckBox* HideCursor; wxCheckBox* RenderToMain; + wxCheckBox* ProgressiveScan; + wxCheckBox* NTSCJ; // Interface wxCheckBox* ConfirmStop; @@ -113,7 +115,6 @@ private: // Misc wxCheckBox* WiiScreenSaver; - wxCheckBox* WiiProgressiveScan; wxCheckBox* WiiEuRGB60; wxChoice* WiiAspectRatio; wxChoice* WiiSystemLang; @@ -194,6 +195,8 @@ private: ID_DISPLAY_FULLSCREEN, ID_DISPLAY_HIDECURSOR, ID_DISPLAY_RENDERTOMAIN, + ID_DISPLAY_PROGSCAN, + ID_DISPLAY_NTSCJ, // Interface settings ID_INTERFACE_CONFIRMSTOP, @@ -225,7 +228,6 @@ private: ID_WII_BT_BAR, ID_WII_IPL_SSV, - ID_WII_IPL_PGS, ID_WII_IPL_E60, ID_WII_IPL_AR_TEXT, ID_WII_IPL_AR,