diff options
| author | Ac_K <Acoustik666@gmail.com> | 2020-03-19 23:37:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 09:37:55 +1100 |
| commit | 32d3f3f69024835d375401222b9abfbd32db37a5 (patch) | |
| tree | 6871397cced80d299a4c479fc86839b15d7eae94 /Ryujinx.HLE/HOS | |
| parent | 561d64e5bfd549c05b65c7bad87362bc03607363 (diff) | |
Implement GetRegionCode and add the RegionCode to settings (#999)
This implement `GetRegionCode` accordingly to RE. I've added a setting in the GUI and a field in the Configuration file with a way to update the Configuration file if needed.
Diffstat (limited to 'Ryujinx.HLE/HOS')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs | 18 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/SystemState/SystemRegion.cs | 16 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs | 7 |
3 files changed, 41 insertions, 0 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs index 2d2512df..a8b10297 100644 --- a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs +++ b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs @@ -54,6 +54,24 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } + [Command(4)] + // GetRegionCode() -> u32 nn::settings::RegionCode + public ResultCode GetRegionCode(ServiceCtx context) + { + // NOTE: Service mount 0x8000000000000050 savedata and read the region code here. + + SystemRegion regionCode = (SystemRegion)context.Device.System.State.DesiredRegionCode; + + if (regionCode < SystemRegion.Min || regionCode > SystemRegion.Max) + { + regionCode = SystemRegion.USA; + } + + context.ResponseData.Write((uint)regionCode); + + return ResultCode.Success; + } + [Command(5)] // GetAvailableLanguageCodes2() -> (u32, buffer<nn::settings::LanguageCode, 6>) public ResultCode GetAvailableLanguageCodes2(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/SystemState/SystemRegion.cs b/Ryujinx.HLE/HOS/SystemState/SystemRegion.cs new file mode 100644 index 00000000..9a07a4a8 --- /dev/null +++ b/Ryujinx.HLE/HOS/SystemState/SystemRegion.cs @@ -0,0 +1,16 @@ +namespace Ryujinx.HLE.HOS.SystemState +{ + public enum SystemRegion + { + Japan, + USA, + Europe, + Australia, + China, + Korea, + Taiwan, + + Min = Japan, + Max = Taiwan + } +}
\ No newline at end of file diff --git a/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs b/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs index c2e6680d..b65d1030 100644 --- a/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs +++ b/Ryujinx.HLE/HOS/SystemState/SystemStateMgr.cs @@ -37,6 +37,8 @@ namespace Ryujinx.HLE.HOS.SystemState internal long DesiredLanguageCode { get; private set; } + internal uint DesiredRegionCode { get; private set; } + public TitleLanguage DesiredTitleLanguage { get; private set; } internal string ActiveAudioOutput { get; private set; } @@ -79,6 +81,11 @@ namespace Ryujinx.HLE.HOS.SystemState } } + public void SetRegion(SystemRegion region) + { + DesiredRegionCode = (uint)region; + } + public void SetAudioOutputAsTv() { ActiveAudioOutput = AudioOutputs[0]; |
