Compare commits

...

2 Commits

Author SHA1 Message Date
Maschell
af509915f9 Bump version to 0.2.5 2024-05-08 23:24:57 +02:00
Maschell
690c2e62f9 Never show splash screen for H&S app 2024-05-08 23:24:57 +02:00
2 changed files with 15 additions and 11 deletions

View File

@ -4,7 +4,7 @@
#include <coreinit/mcp.h>
#include <optional>
#define VERSION "v0.2.4"
#define VERSION "v0.2.5"
#define VERSION_FULL VERSION VERSION_EXTRA
enum Languages {

View File

@ -42,16 +42,20 @@ void SetupRegionSpoofing() {
*/
bool forceOpenConfigMenu = false;
bool isWiiUMenu = false;
if (OSGetTitleID() == 0x0005001010040000L || // Wii U Menu JPN
OSGetTitleID() == 0x0005001010040100L || // Wii U Menu USA
OSGetTitleID() == 0x0005001010040200L) { // Wii U Menu EUR
isWiiUMenu = true;
bool isWiiUMenuOrHS = false;
auto curTitleID = OSGetTitleID();
if (curTitleID == 0x0005001010040000L || // Wii U Menu JPN
curTitleID == 0x0005001010040100L || // Wii U Menu USA
curTitleID == 0x0005001010040200L || // Wii U Menu EUR
curTitleID == 0x000500101004E000L || // Health and Safety Information JPN
curTitleID == 0x000500101004E100L || // Health and Safety Information USA
curTitleID == 0x000500101004E200L) { // Health and Safety Information EUR
isWiiUMenuOrHS = true;
}
if (!isWiiUMenu) {
if (!isWiiUMenuOrHS) {
// Set current values based on title xml
auto regionForCurrentTitleOpt = getRegionForTitle(OSGetTitleID());
auto regionForCurrentTitleOpt = getRegionForTitle(curTitleID);
if (regionForCurrentTitleOpt) {
auto region_from_xml = regionForCurrentTitleOpt.value();
if ((region_from_xml & gCurrentProductArea) == gCurrentProductArea) {
@ -90,7 +94,7 @@ void SetupRegionSpoofing() {
// Read per-title settings. Give current lang/region as default values.
// If we don't have values yet for this title, we only create them if we could get the region for the current title
bool allowDefaultValues = !forceOpenConfigMenu;
auto titleRegionInfoOpt = getTitleRegionInfo(OSGetTitleID(), gCurrentLanguage, gCurrentProductArea, allowDefaultValues);
auto titleRegionInfoOpt = getTitleRegionInfo(curTitleID, gCurrentLanguage, gCurrentProductArea, allowDefaultValues);
if (titleRegionInfoOpt) {
gCurrentProductArea = titleRegionInfoOpt->product_area;
gCurrentLanguage = titleRegionInfoOpt->language;
@ -107,10 +111,10 @@ void SetupRegionSpoofing() {
}
}
if (forceOpenConfigMenu || (!isWiiUMenu && showMenu)) {
if (forceOpenConfigMenu || (!isWiiUMenuOrHS && showMenu)) {
ConfigUtils::openConfigMenu();
// Save (updated) title settings to the storage
if (!saveTitleRegionInfo({OSGetTitleID(), gCurrentLanguage, gCurrentProductArea})) {
if (!saveTitleRegionInfo({curTitleID, gCurrentLanguage, gCurrentProductArea})) {
DEBUG_FUNCTION_LINE_ERR("Failed to save current title region info to storage");
} else {
WUPSStorageError err;