fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'GliniakRepo/experimentals' into canary_experimental

Browse Source
This commit is contained in:
Gliniak
2022-05-19 10:51:44 +02:00
parent e901567193 e9b9302cd3
commit 6c6c5ac14b
12 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/kernel/xam/xam_info.cc
View File

@@ -26,6 +26,7 @@
#include "third_party/fmt/include/fmt/format.h"
DEFINE_int32(avpack, 8, "Video modes", "Video");
DECLARE_int32(user_language);
namespace xe {
namespace kernel {
@@ -210,16 +211,16 @@ dword_result_t XGetGameRegion_entry() { return xeXGetGameRegion(); }
DECLARE_XAM_EXPORT1(XGetGameRegion, kNone, kStub);
dword_result_t XGetLanguage_entry() {
auto desired_language = XLanguage::kEnglish;
auto desired_language = static_cast<XLanguage>(cvars::user_language);
// Switch the language based on game region.
// TODO(benvanik): pull from xex header.
uint32_t game_region = XEX_REGION_NTSCU;
/* uint32_t game_region = XEX_REGION_NTSCU;
if (game_region & XEX_REGION_NTSCU) {
desired_language = XLanguage::kEnglish;
} else if (game_region & XEX_REGION_NTSCJ) {
desired_language = XLanguage::kJapanese;
}
}*/
// Add more overrides?
return uint32_t(desired_language);