From 2e5e724f9401cb3dea28981a93b7467854f98dbb Mon Sep 17 00:00:00 2001
From: "Admiral H. Curtiss" <pikachu025@gmail.com>
Date: Fri, 5 Jun 2015 21:02:53 +0200
Subject: [PATCH] Boot: Automatically temporarily disable PAL60 for NTSC Wii
 games.

Fixes issues like https://code.google.com/p/dolphin-emu/issues/detail?id=7714 and https://code.google.com/p/dolphin-emu/issues/detail?id=8036.
---
 Source/Core/Core/BootManager.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 985af53126..fe332b4051 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -257,6 +257,12 @@ bool BootCore(const std::string& _rFilename)
 		config_cache.bSetEXIDevice[1] = true;
 	}
 
+	// Some NTSC Wii games such as Doc Louis's Punch-Out!! and 1942 (Virtual Console) crash if the PAL60 option is enabled
+	if (StartUp.bWii && StartUp.bNTSC)
+	{
+		StartUp.bPAL60 = false;
+	}
+
 	SConfig::GetInstance().m_SYSCONF->SetData("IPL.PGS", StartUp.bProgressive);
 	SConfig::GetInstance().m_SYSCONF->SetData("IPL.E60", StartUp.bPAL60);