summaryrefslogtreecommitdiffstats
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-12-30 04:09:01 +0100
committerGitHub <noreply@github.com>2016-12-30 04:09:01 +0100
commitf556d6ee90aae2d81cd9770c0b3259ac88ae8fe4 (patch)
tree63472a7c6dbd7bc9f77ba503800afdaf36982da5 /src/citra
parentMerge pull request #2367 from JayFoxRox/lighting-lut-quickfix (diff)
parentConfig: auto-select region and language (diff)
downloadyuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar
yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.gz
yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.bz2
yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.lz
yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.xz
yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.zst
yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.zip
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/config.cpp3
-rw-r--r--src/citra/default_ini.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 29462c982..98f093258 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -89,7 +89,8 @@ void Config::ReadValues() {
// System
Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false);
- Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1);
+ Settings::values.region_value =
+ sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT);
// Miscellaneous
Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info");
diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h
index 001b18ac2..50c4a2812 100644
--- a/src/citra/default_ini.h
+++ b/src/citra/default_ini.h
@@ -101,7 +101,7 @@ use_virtual_sd =
is_new_3ds =
# The system region that Citra will use during emulation
-# 0: Japan, 1: USA (default), 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
+# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
region_value =
[Miscellaneous]