Merge pull request #1 from dolphin-emu/master

update

1 files changed, 12 insertions, 11 deletions

diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp
index 7da110403a..0956f119c9 100644
--- a/Source/Core/DiscIO/VolumeCommon.cpp
+++ b/Source/Core/DiscIO/VolumeCommon.cpp
@@ -15,24 +15,22 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 {
 	switch (CountryCode)
 	{
-		// Region free - fall through to European defaults for now
+		// Region free - Uses European flag as placeholder
 		case 'A':
-
+			return IVolume::COUNTRY_INTERNATIONAL;
 
 		// PAL
-		case 'D': // German
+		case 'D':
 			return IVolume::COUNTRY_GERMANY;
 
 		case 'X': // Used by a couple PAL games
-		case 'Y': // German, french
-
+		case 'Y': // German, French
 		case 'L': // Japanese import to PAL regions
 		case 'M': // Japanese import to PAL regions
-		case 'S': // Spanish-speaking regions
 		case 'P':
 			return IVolume::COUNTRY_EUROPE;
 
-		case 'U': // Australia
+		case 'U':
 			return IVolume::COUNTRY_AUSTRALIA;
 
 		case 'F':
@@ -41,9 +39,15 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 		case 'I':
 			return IVolume::COUNTRY_ITALY;
 
+		case 'H':
+			return IVolume::COUNTRY_NETHERLANDS;
+
 		case 'R':
 			return IVolume::COUNTRY_RUSSIA;
 
+		case 'S':
+			return IVolume::COUNTRY_SPAIN;
+
 		// NTSC
 		case 'E':
 		case 'N': // Japanese import to USA and other NTSC regions
@@ -54,13 +58,10 @@ IVolume::ECountry CountrySwitch(u8 CountryCode)
 			return IVolume::COUNTRY_JAPAN;
 
 		case 'K':
-		case 'T': // Korea with English language
 		case 'Q': // Korea with Japanese language
+		case 'T': // Korea with English language
 			return IVolume::COUNTRY_KOREA;
 
-		case 'O':
-			return IVolume::COUNTRY_SDK;
-
 		case 'W':
 			return IVolume::COUNTRY_TAIWAN;