Merge branch 'main' into main

This commit is contained in:
ADev531 2026-05-23 22:43:50 +09:00 committed by GitHub
commit 8d85d88e4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 53 additions and 13 deletions

View file

@ -18,6 +18,7 @@
#include "config.h"
bool Config::connect_to_network = false;
bool Config::show_startup_toast = false;
bool Config::initialized = false;
bool Config::shown_warning = false;
bool Config::plugin_is_loaded = false;

View file

@ -10,6 +10,8 @@ public:
static bool connect_to_network;
static bool show_startup_toast;
static bool initialized;
static bool shown_warning;

View file

@ -1,6 +1,7 @@
.plugin_name="Inkay"
,.network_category="Network selection"
,.connect_to_network_setting="Connect to Pretendo Network"
,.show_startup_toast_setting="Show startup toast"
,.other_category="Other settings"
,.reset_wwp_setting="Reset Wara Wara Plaza"
,.press_a_action="Press A"

View file

@ -1,6 +1,6 @@
.plugin_name="Inkay"
,.network_category="Netwerkselectie"
,.connect_to_network_setting="Verbind met het Pretendo-netwerk"
,.connect_to_network_setting="Verbind met het Pretendo-Netwerk"
,.other_category="Overige instellingen"
,.reset_wwp_setting="Reset het Wara Wara Plaza"
,.press_a_action="Druk A"
@ -10,4 +10,4 @@
,.using_pretendo_network="Pretendo Network wordt gebruikt"
,.multiplayer_port_display="Gebruikt UDP port %hu voor multiplayer"
,.module_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)"
,.module_init_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)"
,.module_init_not_found="Pretendo-Netwerk patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)"

View file

@ -122,10 +122,12 @@ static InkayStatus Inkay_GetStatus() {
}
}
static void Inkay_Initialize(bool apply_patches, inkay_language language) {
static void Inkay_Initialize(bool apply_patches, bool show_startup_toast, inkay_language language) {
if (Config::initialized)
return;
Config::show_startup_toast = show_startup_toast;
if (Config::block_initialize) {
ShowNotification("Cannot load Inkay while the system is running. Please restart the console");
return;
@ -150,12 +152,16 @@ static void Inkay_Initialize(bool apply_patches, inkay_language language) {
DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches applied successfully.");
ShowNotification(get_pretendo_message(language));
if (Config::show_startup_toast) {
ShowNotification(get_pretendo_message(language));
}
Config::initialized = true;
} else {
DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches skipped.");
ShowNotification(get_nintendo_network_message(language));
if(Config::show_startup_toast) {
ShowNotification(get_nintendo_network_message(language));
}
Config::initialized = true;
return;
}