From 1b8b99e9f1ba543815daec7f3fe41c0e0660deef Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Thu, 18 Jun 2015 00:44:59 +0200 Subject: [PATCH] ConfigManager: Set homebrew video mode based on Dolphin's PAL60 config instead of always using 50Hz. This is a bit indirect, but since homebrew always boots in a European environment the framerate depends on the bPAL60 flag, which is always auto turned off if bNTSC is set to true as of 2e5e724f9401cb3dea28981a93b7467854f98dbb. By actually indicating that we're PAL on homebrew boot, the rest just falls into place. --- Source/Core/Core/ConfigManager.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 577e140a3e..75f047129d 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -717,17 +717,21 @@ bool SConfig::AutoSetup(EBootBS2 _BootBS2) else if (!strcasecmp(Extension.c_str(), ".elf")) { bWii = CBoot::IsElfWii(m_strFilename); - set_region_dir = USA_DIR; + // TODO: Right now GC homebrew boots in NTSC and Wii homebrew in PAL. + // This is intentional so that Wii homebrew can boot in both 50Hz and 60Hz, without forcing all GC homebrew to 50Hz. + // In the future, it probably makes sense to add a Region setting for homebrew somewhere in the emulator config. + bNTSC = bWii ? false : true; + set_region_dir = bNTSC ? USA_DIR : EUR_DIR; m_BootType = BOOT_ELF; - bNTSC = true; } else if (!strcasecmp(Extension.c_str(), ".dol")) { CDolLoader dolfile(m_strFilename); bWii = dolfile.IsWii(); - set_region_dir = USA_DIR; + // TODO: See the ELF code above. + bNTSC = bWii ? false : true; + set_region_dir = bNTSC ? USA_DIR : EUR_DIR; m_BootType = BOOT_DOL; - bNTSC = true; } else if (!strcasecmp(Extension.c_str(), ".dff")) {