ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7415 from JosJuice/korean-shop-channel-check 

Include the Korean Wii Shop Channel when checking default credentials
This commit is contained in:
Pierre Bourdon 2018-09-15 17:37:35 +02:00 committed by GitHub
parent ce9e9186f7 b5bb445f21
commit e3a52b3361
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/CommonTitles.h
View File

@ -14,6 +14,8 @@ constexpr u64 SYSTEM_MENU = 0x0000000100000002;
constexpr u64 SHOP = 0x0001000248414241; constexpr u64 SHOP = 0x0001000248414241;
constexpr u64 KOREAN_SHOP = 0x000100024841424b;
constexpr u64 IOS(u32 major_version) constexpr u64 IOS(u32 major_version)
{ {
return 0x0000000100000000 | major_version; return 0x0000000100000000 | major_version;

3
Source/Core/Core/IOS/ES/ES.cpp
View File

@ -209,7 +209,8 @@ bool ES::LaunchTitle(u64 title_id, bool skip_reload)
NOTICE_LOG(IOS_ES, "Launching title %016" PRIx64 "...", title_id); NOTICE_LOG(IOS_ES, "Launching title %016" PRIx64 "...", title_id);
if (title_id == Titles::SHOP && m_ios.GetIOSC().IsUsingDefaultId()) if ((title_id == Titles::SHOP || title_id == Titles::KOREAN_SHOP) &&
m_ios.GetIOSC().IsUsingDefaultId())
{ {
ERROR_LOG(IOS_ES, "Refusing to launch the shop channel with default device credentials"); ERROR_LOG(IOS_ES, "Refusing to launch the shop channel with default device credentials");
CriticalAlertT("You cannot use the Wii Shop Channel without using your own device credentials." CriticalAlertT("You cannot use the Wii Shop Channel without using your own device credentials."