diff --git a/Data/Sys/GameSettings/MB3.ini b/Data/Sys/GameSettings/MB3.ini
@@ -1,23 +1,10 @@
 # MB3E8P - Monster World IV
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MB6.ini b/Data/Sys/GameSettings/MB6.ini
diff --git a/Data/Sys/GameSettings/MB7.ini b/Data/Sys/GameSettings/MB7.ini
diff --git a/Data/Sys/GameSettings/MB8.ini b/Data/Sys/GameSettings/MB8.ini
diff --git a/Data/Sys/GameSettings/MBA.ini b/Data/Sys/GameSettings/MBA.ini
@@ -1,23 +1,10 @@
 # MBAN8P - Pulseman
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MBB.ini b/Data/Sys/GameSettings/MBB.ini
diff --git a/Data/Sys/GameSettings/MBC.ini b/Data/Sys/GameSettings/MBC.ini
diff --git a/Data/Sys/GameSettings/MBD.ini b/Data/Sys/GameSettings/MBD.ini
diff --git a/Data/Sys/GameSettings/MBE.ini b/Data/Sys/GameSettings/MBE.ini
diff --git a/Data/Sys/GameSettings/MBF.ini b/Data/Sys/GameSettings/MBF.ini
diff --git a/Data/Sys/GameSettings/MBG.ini b/Data/Sys/GameSettings/MBG.ini
diff --git a/Data/Sys/GameSettings/MBI.ini b/Data/Sys/GameSettings/MBI.ini
diff --git a/Data/Sys/GameSettings/MBJ.ini b/Data/Sys/GameSettings/MBJ.ini
diff --git a/Data/Sys/GameSettings/MBK.ini b/Data/Sys/GameSettings/MBK.ini
diff --git a/Data/Sys/GameSettings/MBM.ini b/Data/Sys/GameSettings/MBM.ini
diff --git a/Data/Sys/GameSettings/MBO.ini b/Data/Sys/GameSettings/MBO.ini
diff --git a/Data/Sys/GameSettings/MBP.ini b/Data/Sys/GameSettings/MBP.ini
diff --git a/Data/Sys/GameSettings/MBQ.ini b/Data/Sys/GameSettings/MBQ.ini
diff --git a/Data/Sys/GameSettings/MBR.ini b/Data/Sys/GameSettings/MBR.ini
diff --git a/Data/Sys/GameSettings/MBT.ini b/Data/Sys/GameSettings/MBT.ini
diff --git a/Data/Sys/GameSettings/MBU.ini b/Data/Sys/GameSettings/MBU.ini
diff --git a/Data/Sys/GameSettings/MBW.ini b/Data/Sys/GameSettings/MBW.ini
diff --git a/Data/Sys/GameSettings/MBX.ini b/Data/Sys/GameSettings/MBX.ini
diff --git a/Data/Sys/GameSettings/MBY.ini b/Data/Sys/GameSettings/MBY.ini
diff --git a/Data/Sys/GameSettings/MBZ.ini b/Data/Sys/GameSettings/MBZ.ini
diff --git a/Data/Sys/GameSettings/MC2.ini b/Data/Sys/GameSettings/MC2.ini
diff --git a/Data/Sys/GameSettings/MC3.ini b/Data/Sys/GameSettings/MC3.ini
diff --git a/Data/Sys/GameSettings/MCA.ini b/Data/Sys/GameSettings/MCA.ini
diff --git a/Data/Sys/GameSettings/MCB.ini b/Data/Sys/GameSettings/MCB.ini
diff --git a/Data/Sys/GameSettings/MCC.ini b/Data/Sys/GameSettings/MCC.ini
diff --git a/Data/Sys/GameSettings/MCD.ini b/Data/Sys/GameSettings/MCD.ini
@@ -1,23 +1,10 @@
 # MCDE8P - Sonic & Knuckles
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MCE.ini b/Data/Sys/GameSettings/MCE.ini
diff --git a/Data/Sys/GameSettings/MCG.ini b/Data/Sys/GameSettings/MCG.ini
diff --git a/Data/Sys/GameSettings/MCJ.ini b/Data/Sys/GameSettings/MCJ.ini
diff --git a/Data/Sys/GameSettings/MCK.ini b/Data/Sys/GameSettings/MCK.ini
diff --git a/Data/Sys/GameSettings/MCL.ini b/Data/Sys/GameSettings/MCL.ini
diff --git a/Data/Sys/GameSettings/MCP.ini b/Data/Sys/GameSettings/MCP.ini
diff --git a/Data/Sys/GameSettings/MCQ.ini b/Data/Sys/GameSettings/MCQ.ini
diff --git a/Data/Sys/GameSettings/MCR.ini b/Data/Sys/GameSettings/MCR.ini
diff --git a/Data/Sys/GameSettings/MCS.ini b/Data/Sys/GameSettings/MCS.ini
@@ -1,23 +1,10 @@
 # MCSN8P - Monster Lair
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MCT.ini b/Data/Sys/GameSettings/MCT.ini
diff --git a/Data/Sys/GameSettings/MCV.ini b/Data/Sys/GameSettings/MCV.ini
@@ -1,23 +1,10 @@
 # MCVE8P - Pitfall
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MCW.ini b/Data/Sys/GameSettings/MCW.ini
@@ -1,23 +1,10 @@
 # MCWE8P - Galaxy Force II
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MCY.ini b/Data/Sys/GameSettings/MCY.ini
@@ -1,23 +1,10 @@
 # MCYE8P - Revenge of Shinobi
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-SafeTextureCacheColorSamples = 0
 UseXFB = True
 UseRealXFB = True
diff --git a/Data/Sys/GameSettings/MCZ.ini b/Data/Sys/GameSettings/MCZ.ini
@@ -1,22 +1,10 @@
 # MCZE8P - Shanghai II
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = Use Opengl, D3D has issues.
 EmulationStateId = 4
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 UseXFB = True

diff --git a/Data/Sys/GameSettings/N.ini b/Data/Sys/GameSettings/N.ini
@@ -0,0 +1,4 @@
+# Nxxxxx - All Nintendo 64 Virtual Console games
+
+[Wii]
+Widescreen = False
diff --git a/Data/Sys/GameSettings/PBU.ini → Data/Sys/GameSettings/P.ini b/Data/Sys/GameSettings/PBU.ini → Data/Sys/GameSettings/P.ini
@@ -1,4 +1,5 @@
-# PBUE18 - BRAVOMAN
+# Pxxxxx - All TurboGrafx 16 Virtual Console games 
+# Note: there are a few weird GameCube games (mostly bonus disks) which also use this code.
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -8,16 +9,10 @@
 EmulationStateId = 4
 EmulationIssues = 
 
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video]
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
+
+[Wii]
+Widescreen = False
diff --git a/Data/Sys/GameSettings/PA6.ini b/Data/Sys/GameSettings/PA6.ini
diff --git a/Data/Sys/GameSettings/PA7.ini b/Data/Sys/GameSettings/PA7.ini
diff --git a/Data/Sys/GameSettings/PA9.ini b/Data/Sys/GameSettings/PA9.ini
diff --git a/Data/Sys/GameSettings/PAA.ini b/Data/Sys/GameSettings/PAA.ini
diff --git a/Data/Sys/GameSettings/PAB.ini b/Data/Sys/GameSettings/PAB.ini
diff --git a/Data/Sys/GameSettings/PAC.ini b/Data/Sys/GameSettings/PAC.ini
diff --git a/Data/Sys/GameSettings/PAD.ini b/Data/Sys/GameSettings/PAD.ini
diff --git a/Data/Sys/GameSettings/PAE.ini b/Data/Sys/GameSettings/PAE.ini
diff --git a/Data/Sys/GameSettings/PAF.ini b/Data/Sys/GameSettings/PAF.ini
diff --git a/Data/Sys/GameSettings/PAG.ini b/Data/Sys/GameSettings/PAG.ini
diff --git a/Data/Sys/GameSettings/PAH.ini b/Data/Sys/GameSettings/PAH.ini
diff --git a/Data/Sys/GameSettings/PAI.ini b/Data/Sys/GameSettings/PAI.ini
diff --git a/Data/Sys/GameSettings/PAK.ini b/Data/Sys/GameSettings/PAK.ini
diff --git a/Data/Sys/GameSettings/PAL.ini b/Data/Sys/GameSettings/PAL.ini
diff --git a/Data/Sys/GameSettings/PAM.ini b/Data/Sys/GameSettings/PAM.ini
diff --git a/Data/Sys/GameSettings/PAN.ini b/Data/Sys/GameSettings/PAN.ini
diff --git a/Data/Sys/GameSettings/PAO.ini b/Data/Sys/GameSettings/PAO.ini
diff --git a/Data/Sys/GameSettings/PAR.ini b/Data/Sys/GameSettings/PAR.ini
diff --git a/Data/Sys/GameSettings/PAV.ini b/Data/Sys/GameSettings/PAV.ini
diff --git a/Data/Sys/GameSettings/PAW.ini b/Data/Sys/GameSettings/PAW.ini
diff --git a/Data/Sys/GameSettings/PB2.ini b/Data/Sys/GameSettings/PB2.ini
diff --git a/Data/Sys/GameSettings/PB3.ini b/Data/Sys/GameSettings/PB3.ini
diff --git a/Data/Sys/GameSettings/PB6.ini b/Data/Sys/GameSettings/PB6.ini
diff --git a/Data/Sys/GameSettings/PB8.ini b/Data/Sys/GameSettings/PB8.ini
diff --git a/Data/Sys/GameSettings/PB9.ini b/Data/Sys/GameSettings/PB9.ini
diff --git a/Data/Sys/GameSettings/PBA.ini b/Data/Sys/GameSettings/PBA.ini
diff --git a/Data/Sys/GameSettings/PBD.ini b/Data/Sys/GameSettings/PBD.ini
diff --git a/Data/Sys/GameSettings/PBE.ini b/Data/Sys/GameSettings/PBE.ini
diff --git a/Data/Sys/GameSettings/PBH.ini b/Data/Sys/GameSettings/PBH.ini
diff --git a/Data/Sys/GameSettings/PBI.ini b/Data/Sys/GameSettings/PBI.ini
diff --git a/Data/Sys/GameSettings/PBJ.ini b/Data/Sys/GameSettings/PBJ.ini
diff --git a/Data/Sys/GameSettings/PBM.ini b/Data/Sys/GameSettings/PBM.ini
diff --git a/Data/Sys/GameSettings/PBN.ini b/Data/Sys/GameSettings/PBN.ini
diff --git a/Data/Sys/GameSettings/PBS.ini b/Data/Sys/GameSettings/PBS.ini
diff --git a/Data/Sys/GameSettings/PBT.ini b/Data/Sys/GameSettings/PBT.ini
diff --git a/Data/Sys/GameSettings/PBW.ini b/Data/Sys/GameSettings/PBW.ini
diff --git a/Data/Sys/GameSettings/PBX.ini b/Data/Sys/GameSettings/PBX.ini
diff --git a/Data/Sys/GameSettings/PBZ.ini b/Data/Sys/GameSettings/PBZ.ini
diff --git a/Data/Sys/GameSettings/PC2.ini b/Data/Sys/GameSettings/PC2.ini
diff --git a/Data/Sys/GameSettings/PC6.ini b/Data/Sys/GameSettings/PC6.ini
@@ -17,3 +17,6 @@ EmulationIssues = Menu works but videos do not play, and GCN/GBA emulation is to
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video_Settings]
+# override value that was set in P.ini back to defaults
+SafeTextureCacheColorSamples = 
diff --git a/Data/Sys/GameSettings/PCA.ini b/Data/Sys/GameSettings/PCA.ini
diff --git a/Data/Sys/GameSettings/PCB.ini b/Data/Sys/GameSettings/PCB.ini
diff --git a/Data/Sys/GameSettings/PCE.ini b/Data/Sys/GameSettings/PCE.ini
diff --git a/Data/Sys/GameSettings/PCH.ini b/Data/Sys/GameSettings/PCH.ini
diff --git a/Data/Sys/GameSettings/PCO.ini b/Data/Sys/GameSettings/PCO.ini
diff --git a/Data/Sys/GameSettings/PCR.ini b/Data/Sys/GameSettings/PCR.ini
diff --git a/Data/Sys/GameSettings/PCS.ini b/Data/Sys/GameSettings/PCS.ini
diff --git a/Data/Sys/GameSettings/PCV.ini b/Data/Sys/GameSettings/PCV.ini
diff --git a/Data/Sys/GameSettings/PDJ.ini b/Data/Sys/GameSettings/PDJ.ini
diff --git a/Data/Sys/GameSettings/PRJ.ini b/Data/Sys/GameSettings/PRJ.ini
@@ -17,3 +17,6 @@ EmulationIssues =
 [ActionReplay]
 # Add action replay cheats here.
 
+[Video_Settings]
+# override value that was set in P.ini back to defaults
+SafeTextureCacheColorSamples = 
diff --git a/Data/Sys/GameSettings/PZLE01.ini b/Data/Sys/GameSettings/PZLE01.ini
@@ -641,3 +641,4 @@ $Maximum Magic
 003CB8E3 00000020
 $All Melodies
 003CB98D 0000003F
+
diff --git a/Data/Sys/GameSettings/Q.ini b/Data/Sys/GameSettings/Q.ini
@@ -0,0 +1,14 @@
+# Qxxxxx - All TurboGrafx CD Virtual Console games
+
+[EmuState]
+# The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+
+[Video]
+
+[Video_Settings]
+SafeTextureCacheColorSamples = 0
+
+[Wii]
+Widescreen = False
diff --git a/Data/Sys/GameSettings/QA3.ini b/Data/Sys/GameSettings/QA3.ini
diff --git a/Data/Sys/GameSettings/QAA.ini b/Data/Sys/GameSettings/QAA.ini
diff --git a/Data/Sys/GameSettings/QAB.ini b/Data/Sys/GameSettings/QAB.ini
diff --git a/Data/Sys/GameSettings/QAC.ini b/Data/Sys/GameSettings/QAC.ini
diff --git a/Data/Sys/GameSettings/QAD.ini b/Data/Sys/GameSettings/QAD.ini
diff --git a/Data/Sys/GameSettings/QAF.ini b/Data/Sys/GameSettings/QAF.ini
diff --git a/Data/Sys/GameSettings/QAG.ini b/Data/Sys/GameSettings/QAG.ini
diff --git a/Data/Sys/GameSettings/QAP.ini b/Data/Sys/GameSettings/QAP.ini
diff --git a/Data/Sys/GameSettings/QAS.ini b/Data/Sys/GameSettings/QAS.ini
diff --git a/Data/Sys/GameSettings/QAT.ini b/Data/Sys/GameSettings/QAT.ini
diff --git a/Data/Sys/GameSettings/QAU.ini b/Data/Sys/GameSettings/QAU.ini
diff --git a/Data/Sys/GameSettings/QAW.ini b/Data/Sys/GameSettings/QAW.ini
diff --git a/Data/Sys/GameSettings/QBB.ini b/Data/Sys/GameSettings/QBB.ini
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
@@ -973,6 +973,12 @@ std::vector<std::string> SConfig::GetGameIniFilenames(const std::string& id, u16
 {
 	std::vector<std::string> filenames;
 
+	if (id.empty())
+		return filenames;
+
+	// INIs that match the system code (unique for each Virtual Console system)
+	filenames.push_back(id.substr(0, 1) + ".ini");
+
 	// INIs that match all regions
 	if (id.size() >= 4)
 		filenames.push_back(id.substr(0, 3) + ".ini");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -641,3 +641,4 @@ $Maximum Magic
		003CB8E3 00000020
		$All Melodies
		003CB98D 0000003F