From 19d609284725ccca2ccf51e47bde108ff6af041b Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 17 Mar 2017 21:01:50 +0100 Subject: [PATCH 1/3] Display nicer version strings for the Wii Menu The Tools > Load System Menu option displays the version of the installed Wii Menu. This commit changes the way we display that version, like so: "Load System Menu 514P" -> "Load System Menu 4.3E" The numbers are from http://wiibrew.org/wiki/System_Menu --- Source/Core/DiscIO/Enums.cpp | 56 +++++++++++++++++++++++++++ Source/Core/DiscIO/Enums.h | 3 ++ Source/Core/DolphinWX/MainMenuBar.cpp | 7 ++-- 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index 2ef5b0e344..a124362266 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -141,6 +141,62 @@ u8 GetSysMenuRegion(u16 title_version) } } +std::string GetSysMenuVersionString(u16 title_version) +{ + if (title_version == 33) + return "1.0"; // 1.0 uses 33 as the version number in all regions + + std::string region_letter; + + switch (GetSysMenuRegion(title_version)) + { + case 'J': + region_letter = "J"; + break; + case 'E': + region_letter = "U"; + break; + case 'P': + region_letter = "E"; + break; + case 'K': + region_letter = "K"; + break; + } + + switch (title_version & ~0xf) + { + case 96: + case 128: + return "2.0" + region_letter; + case 160: + return "2.1" + region_letter; + case 192: + return "2.2" + region_letter; + case 224: + return "3.0" + region_letter; + case 256: + return "3.1" + region_letter; + case 288: + return "3.2" + region_letter; + case 320: + case 352: + return "3.3" + region_letter; + case 384: + return (region_letter != "K" ? "3.4" : "3.5") + region_letter; + case 416: + return "4.0" + region_letter; + case 448: + return "4.1" + region_letter; + case 480: + return "4.2" + region_letter; + case 512: + return "4.3" + region_letter; + default: + return "?.?" + region_letter; + } +} + std::string GetCompanyFromID(const std::string& company_id) { static const std::map companies = { diff --git a/Source/Core/DiscIO/Enums.h b/Source/Core/DiscIO/Enums.h index 8e7ee5259b..0d95e263f0 100644 --- a/Source/Core/DiscIO/Enums.h +++ b/Source/Core/DiscIO/Enums.h @@ -4,6 +4,8 @@ #pragma once +#include + #include "Common/CommonTypes.h" namespace DiscIO @@ -71,5 +73,6 @@ Region RegionSwitchGC(u8 country_code); Region RegionSwitchWii(u8 country_code); Country CountrySwitch(u8 country_code); u8 GetSysMenuRegion(u16 title_version); +std::string GetSysMenuVersionString(u16 title_version); std::string GetCompanyFromID(const std::string& company_id); } diff --git a/Source/Core/DolphinWX/MainMenuBar.cpp b/Source/Core/DolphinWX/MainMenuBar.cpp index fe5a14c5cf..55cf2d378e 100644 --- a/Source/Core/DolphinWX/MainMenuBar.cpp +++ b/Source/Core/DolphinWX/MainMenuBar.cpp @@ -545,11 +545,10 @@ void MainMenuBar::RefreshWiiSystemMenuLabel() const if (sys_menu_loader.IsValid()) { - const u16 sys_menu_version = sys_menu_loader.GetTMD().GetTitleVersion(); - const char sys_menu_region = DiscIO::GetSysMenuRegion(sys_menu_version); + const u16 version_number = sys_menu_loader.GetTMD().GetTitleVersion(); + const wxString version_string = StrToWxStr(DiscIO::GetSysMenuVersionString(version_number)); item->Enable(); - item->SetItemLabel( - wxString::Format(_("Load Wii System Menu %u%c"), sys_menu_version, sys_menu_region)); + item->SetItemLabel(wxString::Format(_("Load Wii System Menu %s"), version_string)); } else { From 04c49aa395073b1706e02115c11b4f7f1377f428 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 17 Mar 2017 21:10:41 +0100 Subject: [PATCH 2/3] Fix GetSysMenuRegion's handling of Wii Menu 1.0 This was a regression in 58bd129. --- Source/Core/DiscIO/Enums.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index a124362266..67799a380d 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -126,6 +126,9 @@ Country CountrySwitch(u8 country_code) u8 GetSysMenuRegion(u16 title_version) { + if (title_version == 33) + return 'A'; // 1.0 uses 33 as the version number in all regions + switch (title_version & 0xf) { case 0: From 9d54e4a9de3b7f31a8df2e9fc6d9c3be3806aab4 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 17 Mar 2017 21:16:59 +0100 Subject: [PATCH 3/3] Return a more meaningful type from GetSysMenuRegion --- Source/Core/Core/IOS/ES/Formats.cpp | 2 +- Source/Core/DiscIO/Enums.cpp | 39 ++++++++++++++++++------- Source/Core/DiscIO/Enums.h | 3 +- Source/Core/DiscIO/VolumeWad.cpp | 2 +- Source/Core/DiscIO/VolumeWiiCrypted.cpp | 18 ++---------- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/Source/Core/Core/IOS/ES/Formats.cpp b/Source/Core/Core/IOS/ES/Formats.cpp index 484273d2d9..89c6f2e25a 100644 --- a/Source/Core/Core/IOS/ES/Formats.cpp +++ b/Source/Core/Core/IOS/ES/Formats.cpp @@ -118,7 +118,7 @@ u64 TMDReader::GetIOSId() const DiscIO::Region TMDReader::GetRegion() const { if (GetTitleId() == 0x0000000100000002) - return DiscIO::RegionSwitchWii(DiscIO::GetSysMenuRegion(GetTitleVersion())); + return DiscIO::GetSysMenuRegion(GetTitleVersion()); return DiscIO::RegionSwitchWii(static_cast(GetTitleId() & 0xff)); } diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index 67799a380d..f6311422fe 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -18,6 +18,23 @@ bool IsNTSC(Region region) // Increment CACHE_REVISION (ISOFile.cpp & GameFile.cpp) if the code below is modified +Country TypicalCountryForRegion(Region region) +{ + switch (region) + { + case Region::NTSC_J: + return Country::COUNTRY_JAPAN; + case Region::NTSC_U: + return Country::COUNTRY_USA; + case Region::PAL: + return Country::COUNTRY_EUROPE; + case Region::NTSC_K: + return Country::COUNTRY_KOREA; + default: + return Country::COUNTRY_UNKNOWN; + } +} + Region RegionSwitchGC(u8 country_code) { Region region = RegionSwitchWii(country_code); @@ -124,23 +141,23 @@ Country CountrySwitch(u8 country_code) } } -u8 GetSysMenuRegion(u16 title_version) +Region GetSysMenuRegion(u16 title_version) { if (title_version == 33) - return 'A'; // 1.0 uses 33 as the version number in all regions + return Region::UNKNOWN_REGION; // 1.0 uses 33 as the version number in all regions switch (title_version & 0xf) { case 0: - return 'J'; + return Region::NTSC_J; case 1: - return 'E'; + return Region::NTSC_U; case 2: - return 'P'; + return Region::PAL; case 6: - return 'K'; + return Region::NTSC_K; default: - return 'A'; + return Region::UNKNOWN_REGION; } } @@ -153,16 +170,16 @@ std::string GetSysMenuVersionString(u16 title_version) switch (GetSysMenuRegion(title_version)) { - case 'J': + case Region::NTSC_J: region_letter = "J"; break; - case 'E': + case Region::NTSC_U: region_letter = "U"; break; - case 'P': + case Region::PAL: region_letter = "E"; break; - case 'K': + case Region::NTSC_K: region_letter = "K"; break; } diff --git a/Source/Core/DiscIO/Enums.h b/Source/Core/DiscIO/Enums.h index 0d95e263f0..b06576c685 100644 --- a/Source/Core/DiscIO/Enums.h +++ b/Source/Core/DiscIO/Enums.h @@ -69,10 +69,11 @@ enum class Language }; bool IsNTSC(Region region); +Country TypicalCountryForRegion(Region region); Region RegionSwitchGC(u8 country_code); Region RegionSwitchWii(u8 country_code); Country CountrySwitch(u8 country_code); -u8 GetSysMenuRegion(u16 title_version); +Region GetSysMenuRegion(u16 title_version); std::string GetSysMenuVersionString(u16 title_version); std::string GetCompanyFromID(const std::string& company_id); } diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 79e5423d54..90913f3463 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -77,7 +77,7 @@ Country CVolumeWAD::GetCountry() const u8 country_code = static_cast(m_tmd.GetTitleId() & 0xff); if (country_code == 2) // SYSMENU - country_code = GetSysMenuRegion(m_tmd.GetTitleVersion()); + return TypicalCountryForRegion(GetSysMenuRegion(m_tmd.GetTitleVersion())); return CountrySwitch(country_code); } diff --git a/Source/Core/DiscIO/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/VolumeWiiCrypted.cpp index 4cf13ffa8f..31d13ba68b 100644 --- a/Source/Core/DiscIO/VolumeWiiCrypted.cpp +++ b/Source/Core/DiscIO/VolumeWiiCrypted.cpp @@ -174,22 +174,10 @@ Country CVolumeWiiCrypted::GetCountry() const const Region region = GetRegion(); - if (RegionSwitchWii(country_byte) == region) - return CountrySwitch(country_byte); + if (RegionSwitchWii(country_byte) != region) + return TypicalCountryForRegion(region); - switch (region) - { - case Region::NTSC_J: - return Country::COUNTRY_JAPAN; - case Region::NTSC_U: - return Country::COUNTRY_USA; - case Region::PAL: - return Country::COUNTRY_EUROPE; - case Region::NTSC_K: - return Country::COUNTRY_KOREA; - default: - return Country::COUNTRY_UNKNOWN; - } + return CountrySwitch(country_byte); } std::string CVolumeWiiCrypted::GetMakerID() const