chore: bump wiiu-env/devkitppc from 20250608 to 20260504

Bumps wiiu-env/devkitppc from 20250608 to 20260504.

---
updated-dependencies:
- dependency-name: wiiu-env/devkitppc
  dependency-version: '20260504'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "docker" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore: "
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore: "

.github/workflows/ci.yml

@@ -8,15 +8,15 @@ on:
 
 jobs:
     build-inkay:
-        runs-on: debian-trixie
+        runs-on: ubuntu-22.04
         steps:
-            - uses: actions/checkout@v7
+            - uses: actions/checkout@v6
             - name: build toolchain container
               run: docker build . -t builder
-            - uses: https://github.com/ammaraskar/gcc-problem-matcher@master
+            - uses: ammaraskar/gcc-problem-matcher@master
             - name: build Inkay
               run: docker run --rm -v ${PWD}:/app -w /app builder
-            - uses: actions/upload-artifact@v3
+            - uses: actions/upload-artifact@v7
               with:
                   name: inkay
                   path: dist/

Dockerfile

@@ -4,7 +4,7 @@ COPY --from=ghcr.io/wiiu-env/libnotifications:20240426  /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libkernel:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libmocha:20231127 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20250219 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20250208 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240505 /artifacts $DEVKITPRO
 
 WORKDIR /app

Makefile

@@ -19,7 +19,7 @@ WUT_ROOT := $(DEVKITPRO)/wut
 # DATA is a list of directories containing data files
 # INCLUDES is a list of directories containing header files
 #-------------------------------------------------------------------------------
-TARGET		:=	Malamar-spfn
+TARGET		:=	Inkay-pretendo
 BUILD		:=	build
 SOURCES		:=	src src/patches src/utils src/ext/inih common
 DATA		:=	data

README.md

@@ -1,6 +1,8 @@
-# Malamar - Aroma patches for Splatfestival Network/Spacebar
+# Inkay - Aroma patches for Pretendo
 
-Malamar is an Aroma/WUPS plugin based on Pretendo's Malamar that patches various Nintendo Network URLs on a Wii U to use Splatfestival/Spacebar Network instead. It also (for the time being) bypasses SSL verification in most cases. It redirects Nintendo Network in:
+[![Pretendo network logo](https://github.com/PretendoNetwork/website/raw/master/public/assets/images/opengraph/opengraph-image.png)](https://pretendo.network)
+
+Inkay is an Aroma/WUPS plugin that patches various Nintendo Network URLs on a Wii U to use Pretendo Network instead. It also (for the time being) bypasses SSL verification in most cases. It redirects Nintendo Network in:
 
 - IOSU-side connections (Friends, SpotPass, accounts etc.)
 - Account Settings
@@ -9,27 +11,27 @@ Malamar is an Aroma/WUPS plugin based on Pretendo's Malamar that patches various
 - Miiverse (in-game)
 - Miiverse applet
 
-Malamar also includes game-specific patches to add extra features:
+Inkay also includes game-specific patches to add extra features:
 - Modpack-specific matchmaking for global, regional rooms (by simulating extra DLC) - **Mario Kart 8**
 - P2P port override for better connection stability (if you port forward) - **Minecraft: Wii U Edition**, **Mario Kart 8**, **Splatoon**
 
 ## Requirements
-Malamar is only supported on the release version of Aroma configured for autoboot/coldboot. Other configurations (specifically lacking coldboot) may cause issues with SpotPass.
+Inkay is only supported on the release version of Aroma configured for autoboot/coldboot. Other configurations (specifically lacking coldboot) may cause issues with SpotPass.
 
 ## Safety
-Malamar's patches are all temporary, and only applied in-memory without modifying your console. The SSL patch, while also temporary, could reduce the overall security of your console while active - this is because it no longer checks if a server is verified. However, this does not apply to the Internet Browser, where SSL still works as expected.
+Inkay's patches are all temporary, and only applied in-memory without modifying your console. The SSL patch, while also temporary, could reduce the overall security of your console while active - this is because it no longer checks if a server is verified. However, this does not apply to the Internet Browser, where SSL still works as expected.
 
 ## Compiling - Docker
-Malamar's dependencies and build tooling can be handled as a container, which is recommended for WUPS plugins. Using `docker` or `podman`:
+Inkay's dependencies and build tooling can be handled as a container, which is recommended for WUPS plugins. Using `docker` or `podman`:
 ```shell
-docker build -t malamar .
+docker build -t inkay .
-docker run --rm -v $(pwd):/app malamar make
+docker run --rm -v $(pwd):/app inkay make
 # you can replace "make" with other commands - e.g. make clean
 ```
 If using `podman` on SELinux systems (like Fedora Linux), you might need to use `$(pwd):/app:Z` instead of `$(pwd):/app`.
 
 ## Compiling - System
-Malamar has the following dependencies aside from devkitPPC and wut:
+Inkay has the following dependencies aside from devkitPPC and wut:
 - [WiiUPluginSystem](https://github.com/wiiu-env/WiiUPluginSystem)
 - [WiiUModuleSystem](https://github.com/wiiu-env/WiiUModuleSystem)
 - [libmocha](https://github.com/wiiu-env/libmocha)
@@ -37,4 +39,7 @@ Malamar has the following dependencies aside from devkitPPC and wut:
 - [libnotifications](https://github.com/wiiu-env/libnotifications/)
 - [libfunctionpatcher](https://github.com/wiiu-env/libfunctionpatcher)
 
-Each of these should be `make install`-able. After that, you can compile Malamar with `make`.
+Each of these should be `make install`-able. After that, you can compile Inkay with `make`.
+
+## TODO
+See [Issues](https://github.com/PretendoNetwork/Inkay/issues).

common/inkay_config.h

@@ -15,7 +15,7 @@
 #endif
 
 #ifndef NETWORK_BASEURL
-#define NETWORK_BASEURL "spbr.net"
+#define NETWORK_BASEURL "pretendo.cc"
 #endif
 
 #endif //INKAY_INKAY_CONFIG_H

common/lang.cpp

@@ -4,44 +4,41 @@
 
 #include "lang.h"
 
-config_strings get_config_strings(inkay_language language) {
+config_strings get_config_strings(nn::swkbd::LanguageType language) {
     switch (language) {
-        case inkay_language::English:
+        case nn::swkbd::LanguageType::English:
         default: return {
 #include "en_US.lang"
             };
-        case inkay_language::Spanish: return {
+        case nn::swkbd::LanguageType::Spanish: return {
 #include "es_ES.lang"
             };
-        case inkay_language::French: return {
+        case nn::swkbd::LanguageType::French: return {
 #include "fr_FR.lang"
             };
-        case inkay_language::Italian: return {
+        case nn::swkbd::LanguageType::Italian: return {
 #include "it_IT.lang"
             };
-        case inkay_language::German: return {
+        case nn::swkbd::LanguageType::German: return {
 #include "de_DE.lang"
             };
-        case inkay_language::SimplifiedChinese: return {
+        case nn::swkbd::LanguageType::SimplifiedChinese: return {
 #include "zh_CN.lang"
             };
-        case inkay_language::Portuguese: return {
+        case nn::swkbd::LanguageType::TraditionalChinese: return {
+#include "zh_Hant.lang"
+            };
+        case nn::swkbd::LanguageType::Portuguese: return {
 #include "pt_BR.lang"
             };
-        case inkay_language::Japanese: return {
+        case nn::swkbd::LanguageType::Japanese: return {
 #include "ja_JP.lang"
             };
-        case inkay_language::Dutch: return {
+        case nn::swkbd::LanguageType::Dutch: return {
 #include "nl_NL.lang"
             };
-        case inkay_language::Russian: return {
+        case nn::swkbd::LanguageType::Russian: return {
 #include "ru_RU.lang"
             };
-        case inkay_language::Korean: return {
-#include "ko_KR.lang"
-            };
-        case inkay_language::EnUwU: return {
-#include "en@uwu.lang"
-            };
     }
 }

common/lang.h

@@ -1,32 +1,12 @@
 #pragma once
 
 #include <string_view>
-
+#include <nn/swkbd.h>
-enum inkay_language {
-    // Wii U System Languages
-    Japanese = 0,
-    English,
-    French,
-    German,
-    Italian,
-    Spanish,
-    SimplifiedChinese,
-    Korean,
-    Dutch,
-    Portuguese,
-    Russian,
-    TraditionalChinese,
-    Invalid,
-    // Custom Languages
-    System,
-    EnUwU,
-};
 
 struct config_strings {
     const char *plugin_name;
     std::string_view network_category;
     std::string_view connect_to_network_setting;
-    std::string_view show_startup_toast_setting;
     std::string_view other_category;
     std::string_view reset_wwp_setting;
     std::string_view press_a_action;
@@ -37,11 +17,6 @@ struct config_strings {
     std::string_view multiplayer_port_display;
     std::string_view module_not_found;
     std::string_view module_init_not_found;
-    std::string_view setting_yes;
-    std::string_view setting_no;
-    std::string_view language_setting;
-    std::string_view language_name;
-    std::string_view system_language;
 };
 
-config_strings get_config_strings(inkay_language language);
+config_strings get_config_strings(nn::swkbd::LanguageType language);

common/sysconfig.cpp

@@ -53,7 +53,7 @@ nn::swkbd::LanguageType get_system_language() {
         return nn::swkbd::LanguageType::English;
     }
 
-    DEBUG_FUNCTION_LINE_VERBOSE("System language found: %d", static_cast<int>(language));
+    DEBUG_FUNCTION_LINE_VERBOSE("System language found: %d", language);
     cached_language = language;
     return language;
 }
@@ -80,7 +80,7 @@ static void get_mcp_config() {
     mcp_os_version = os_version;
 
     DEBUG_FUNCTION_LINE_VERBOSE("Running on %d.%d.%d%c; %s%s",
-                                os_version.major, os_version.minor, os_version.patch, os_version.region,
+                                os_version.major, os_version.minor, os_version.patch, os_version.region
                                         config.code_id, config.serial_id
     );
 }

plugin/Makefile

@@ -19,7 +19,7 @@ WUMS_ROOT := $(DEVKITPRO)/wums
 # DATA is a list of directories containing data files
 # INCLUDES is a list of directories containing header files
 #-------------------------------------------------------------------------------
-TARGET		:=	Malamar-spfn
+TARGET		:=	Inkay-pretendo
 BUILD		:=	build
 SOURCES		:=	src src/utils ../common
 DATA		:=	data

plugin/src/config.cpp

@@ -25,7 +25,6 @@
 #include <wups.h>
 #include <wups/storage.h>
 #include <wups/config_api.h>
-#include <wups/config/WUPSConfigItemMultipleValues.h>
 #include <wups/config/WUPSConfigItemBoolean.h>
 #include <wups/config/WUPSConfigItemStub.h>
 
@@ -40,15 +39,12 @@
 static config_strings strings;
 
 bool Config::connect_to_network = true;
-bool Config::show_startup_toast = true;
 bool Config::need_relaunch = false;
 bool Config::unregister_task_item_pressed = false;
 bool Config::is_wiiu_menu = false;
-uint32_t Config::language = 13;
-inkay_language Config::current_language = English;
 
-static WUPSConfigAPICallbackStatus report_error(WUPSConfigAPIStatus err, int line) {
+static WUPSConfigAPICallbackStatus report_error(WUPSConfigAPIStatus err) {
-    DEBUG_FUNCTION_LINE_VERBOSE("WUPS config error: %s (L%04d)", WUPSConfigAPI_GetStatusStr(err), line);
+    DEBUG_FUNCTION_LINE_VERBOSE("WUPS config error: %s", WUPSConfigAPI_GetStatusStr(err));
     return WUPSCONFIG_API_CALLBACK_RESULT_ERROR;
 }
 
@@ -63,40 +59,21 @@ static void connect_to_network_changed(ConfigItemBoolean *item, bool new_value)
     }
     Config::connect_to_network = new_value;
 
-    WUPSStorageError res = WUPSStorageAPI_StoreBool(nullptr, "connect_to_network", Config::connect_to_network);
+    WUPSStorageError res;
-    if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
+    res = WUPSStorageAPI::Store<bool>("connect_to_network", Config::connect_to_network);
-}
-
-static void language_changed(ConfigItemMultipleValues *item, uint32_t new_value) {
-    DEBUG_FUNCTION_LINE_VERBOSE("language changed to: %d", new_value);
-    if (new_value != Config::language) {
-        if (new_value == inkay_language::System)
-            Config::current_language = (inkay_language) get_system_language();
-        else
-            Config::current_language = (inkay_language) new_value;
-    }
-    Config::language = new_value;
-
-    WUPSStorageError res = WUPSStorageAPI_StoreU32(nullptr, "language", Config::language);
-    if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-}
-
-static void show_startup_toast_changed(ConfigItemBoolean *item, bool new_value) {
-    DEBUG_FUNCTION_LINE_VERBOSE("show_startup_toast changed to: %d", new_value);
-    Config::show_startup_toast = new_value;
-
-    WUPSStorageError res = WUPSStorageAPI_StoreBool(nullptr, "show_startup_toast", Config::show_startup_toast);
     if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
 }
 
 static void unregister_task_item_on_input_cb(void *context, WUPSConfigSimplePadData input) {
-    if (!Config::unregister_task_item_pressed && Config::is_wiiu_menu && (
+    if (!Config::unregister_task_item_pressed && Config::is_wiiu_menu && ((input.buttons_d & WUPS_CONFIG_BUTTON_A) == WUPS_CONFIG_BUTTON_A)) {
-            (input.buttons_d & WUPS_CONFIG_BUTTON_A) == WUPS_CONFIG_BUTTON_A)) {
+
         nn::act::Initialize();
         Initialize__Q2_2nn4bossFv();
 
-        for (uint8_t i = 1; i <= nn::act::GetNumOfAccounts(); i++) {
+        for (uint8_t i = 1; i <= nn::act::GetNumOfAccounts(); i++)
-            if (nn::act::IsSlotOccupied(i) && nn::act::IsNetworkAccountEx(i)) {
+        {
+            if (nn::act::IsSlotOccupied(i) && nn::act::IsNetworkAccountEx(i))
+            {
               nn::boss::Task task{};
               nn::act::PersistentId persistentId = nn::act::GetPersistentIdEx(i);
 
@@ -106,8 +83,7 @@ static void unregister_task_item_on_input_cb(void *context, WUPSConfigSimplePadD
       // bypasses compiler warning about unused variable
       #ifdef DEBUG
               uint32_t res = Unregister__Q3_2nn4boss4TaskFv(&task);
-                DEBUG_FUNCTION_LINE_VERBOSE("Unregistered oltopic for: SlotNo %d | Persistent ID %08x -> 0x%08x", i,
+              DEBUG_FUNCTION_LINE_VERBOSE("Unregistered oltopic for: SlotNo %d | Persistent ID %08x -> 0x%08x", i, persistentId, res);
-                                            persistentId, res);
       #else
               Unregister__Q3_2nn4boss4TaskFv(&task);
       #endif
@@ -139,62 +115,48 @@ static int32_t unregister_task_item_get_display_value(void *context, char *out_b
     return 0;
 }
 
-static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHandle root_cat) {
+static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHandle rootHandle) {
     WUPSConfigAPIStatus err;
+    bool res;
 
     uint64_t current_title_id = OSGetTitleID();
     uint64_t wiiu_menu_tid = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_WII_U_MENU);
     Config::is_wiiu_menu = (current_title_id == wiiu_menu_tid);
 
     // get translation strings
-    strings = get_config_strings(Config::current_language);
+    strings = get_config_strings(get_system_language());
 
-    // Network submenu
+    // create root config category
-    //    Connect to Pretendo Network        Yes/No
+    WUPSConfigCategory root = WUPSConfigCategory(rootHandle);
-    //    Using UDP port 5000 for multiplayer
 
-    WUPSConfigCategoryHandle network_cat;
+    auto network_cat = WUPSConfigCategory::Create(strings.network_category, err);
-    err = WUPSConfigAPI_Category_Create({strings.network_category.data()}, &network_cat);
+    if (!network_cat) return report_error(err);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
 
-    WUPSConfigItemHandle connect_item;
+    //                                                  config id                   display name            default        current value             changed callback
-    err = WUPSConfigItemBoolean_CreateEx(
+    auto connect_item = WUPSConfigItemBoolean::Create("connect_to_network", strings.connect_to_network_setting, true, Config::connect_to_network, &connect_to_network_changed, err);
-        "connect_to_network", strings.connect_to_network_setting.data(), true, Config::connect_to_network,
+    if (!connect_item) return report_error(err);
-        &connect_to_network_changed, strings.setting_yes.data(), strings.setting_no.data(), &connect_item);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
 
-    err = WUPSConfigAPI_Category_AddItem(network_cat, connect_item);
+    res = network_cat->add(std::move(*connect_item), err);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
+    if (!res) return report_error(err);
 
-    const uint16_t port = get_console_peertopeer_port();
+    {
+        uint16_t port = get_console_peertopeer_port();
         char buffer[256];
         snprintf(buffer, sizeof(buffer), strings.multiplayer_port_display.data(), port);
+        auto multiplayer_port_display = WUPSConfigItemStub::Create(buffer, err);
+        if (!multiplayer_port_display) return report_error(err);
 
-    WUPSConfigItemHandle multiplayer_port_display;
+        res = network_cat->add(std::move(*multiplayer_port_display), err);
-    err = WUPSConfigItemStub_Create(buffer, &multiplayer_port_display);
+        if (!res) return report_error(err);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
+    }
 
-    err = WUPSConfigAPI_Category_AddItem(network_cat, multiplayer_port_display);
+    res = root.add(std::move(*network_cat), err);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
+    if (!res) return report_error(err);
 
-    // Add to root and finish
+    auto other_cat = WUPSConfigCategory::Create(strings.other_category, err);
-    err = WUPSConfigAPI_Category_AddCategory(root_cat, network_cat);
+    if (!other_cat) return report_error(err);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
 
-    // Other category
+    WUPSConfigAPIItemCallbacksV2 unregisterTasksItemCallbacks = {
-    //    Reset Wara Wara Plaza  Press A
-    //    Language               English/Spanish/etc..
-    //    Show startup toast     Yes/No
-
-    WUPSConfigCategoryHandle other_cat;
-    err = WUPSConfigAPI_Category_Create({strings.other_category.data()}, &other_cat);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
-
-    WUPSConfigItemHandle unregisterTasksItem;
-    err = WUPSConfigAPI_Item_Create({
-                                        .displayName = strings.reset_wwp_setting.data(),
-                                        .context = nullptr,
-                                        .callbacks = {
             .getCurrentValueDisplay = unregister_task_item_get_display_value,
             .getCurrentValueSelectedDisplay = unregister_task_item_get_display_value,
             .onSelected = nullptr,
@@ -204,69 +166,31 @@ static WUPSConfigAPICallbackStatus ConfigMenuOpenedCallback(WUPSConfigCategoryHa
             .onInput = unregister_task_item_on_input_cb,
             .onInputEx = nullptr,
             .onDelete = nullptr
-                                        },
-                                    }, &unregisterTasksItem);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
-
-    err = WUPSConfigAPI_Category_AddItem(other_cat, unregisterTasksItem);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
-
-    // TODO localise these!
-    constexpr std::array<ConfigItemMultipleValuesPair, 14> languages = {
-        {
-            {0, "Japanese"},
-            {1, "English"},
-            {2, "French"},
-            {3, "German"},
-            {4, "Italian"},
-            {5, "Spanish"},
-            {6, "Simplified Chinese"},
-            {7, "Korean"},
-            {8, "Dutch"},
-            {9, "Portuguese"},
-            {10, "Russian"},
-            {11, "Traditional Chinese"},
-            {13, "System"},
-            {14, "English (UwU)"},
-        }
     };
 
-    constexpr auto find_lang = [languages](const uint32_t lang) -> int {
+    WUPSConfigAPIItemOptionsV2 unregisterTasksItemOptions = {
-        return std::ranges::find_if(languages, [lang](auto const l) { return l.value == lang; }) -
+            .displayName = strings.reset_wwp_setting.data(),
-               std::begin(languages);
+            .context = nullptr,
+            .callbacks = unregisterTasksItemCallbacks,
     };
-    constexpr int system_language = find_lang(13 /* System */);
-    const int current_language = find_lang(Config::language);
 
-    WUPSConfigItemHandle language_item;
+    WUPSConfigItemHandle unregisterTasksItem;
-    err = WUPSConfigItemMultipleValues_Create("language", strings.language_setting.data(), system_language,
+    err = WUPSConfigAPI_Item_Create(unregisterTasksItemOptions, &unregisterTasksItem);
-                                              current_language,
+    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err);
-                                              const_cast<ConfigItemMultipleValuesPair *>(languages.data()), // Yikes!
-                                              languages.size(), &language_changed, &language_item);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
 
-    err = WUPSConfigAPI_Category_AddItem(other_cat, language_item);
+    err = WUPSConfigAPI_Category_AddItem(other_cat->getHandle(), unregisterTasksItem);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
+    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err);
 
-    WUPSConfigItemHandle startup_toast_item;
+    res = root.add(std::move(*other_cat), err);
-    err = WUPSConfigItemBoolean_CreateEx("show_startup_toast", strings.show_startup_toast_setting.data(), true,
+    if (!res) return report_error(err);
-                                         Config::show_startup_toast, &show_startup_toast_changed,
-                                         strings.setting_yes.data(), strings.setting_no.data(), &startup_toast_item);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
-
-    err = WUPSConfigAPI_Category_AddItem(other_cat, startup_toast_item);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
-
-    // finish up
-    err = WUPSConfigAPI_Category_AddCategory(root_cat, other_cat);
-    if (err != WUPSCONFIG_API_RESULT_SUCCESS) return report_error(err, __LINE__);
 
     return WUPSCONFIG_API_CALLBACK_RESULT_SUCCESS;
 }
 
 static void ConfigMenuClosedCallback() {
     // Save all changes
-    WUPSStorageError res = WUPSStorageAPI_SaveStorage(false);
+    WUPSStorageError res;
+    res = WUPSStorageAPI::SaveStorage();
     if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
 
     if (Config::need_relaunch) {
@@ -278,54 +202,33 @@ static void ConfigMenuClosedCallback() {
 }
 
 void Config::Init() {
+    WUPSConfigAPIStatus cres;
+
     // Init the config api
-    WUPSConfigAPIStatus cres =
+    WUPSConfigAPIOptionsV1 configOptions = { .name = "Inkay" };
-            WUPSConfigAPI_Init({.name = "Inkay"}, ConfigMenuOpenedCallback, ConfigMenuClosedCallback);
+    cres = WUPSConfigAPI_Init(configOptions, ConfigMenuOpenedCallback, ConfigMenuClosedCallback);
-    if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void) report_error(cres, __LINE__);
+    if (cres != WUPSCONFIG_API_RESULT_SUCCESS) return (void)report_error(cres);
 
     WUPSStorageError res;
-    // Try to get values from storage
+    // Try to get value from storage
-    res = WUPSStorageAPI_GetBool(nullptr, "connect_to_network", &Config::connect_to_network);
+    res = WUPSStorageAPI::Get<bool>("connect_to_network", Config::connect_to_network);
     if (res == WUPS_STORAGE_ERROR_NOT_FOUND) {
-        DEBUG_FUNCTION_LINE_VERBOSE("Connect to network value not found, attempting to migrate/create");
+        DEBUG_FUNCTION_LINE("Connect to network value not found, attempting to migrate/create");
 
         bool skipPatches = false;
-        if (WUPSStorageAPI_GetBool(nullptr, "skipPatches", &skipPatches) == WUPS_STORAGE_ERROR_SUCCESS) {
+        if (WUPSStorageAPI::Get<bool>("skipPatches", skipPatches) == WUPS_STORAGE_ERROR_SUCCESS) {
             // Migrate old config value
             Config::connect_to_network = !skipPatches;
-            WUPSStorageAPI_DeleteItem(nullptr, "skipPatches");
+            WUPSStorageAPI::DeleteItem("skipPatches");
         }
     
         // Add the value to the storage if it's missing.
-        res = WUPSStorageAPI_StoreBool(nullptr, "connect_to_network", connect_to_network);
+        res = WUPSStorageAPI::Store<bool>("connect_to_network", connect_to_network);
         if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-    } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
+    }
-
+    else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-    res = WUPSStorageAPI_GetU32(nullptr, "language", &Config::language);
-    if (res == WUPS_STORAGE_ERROR_NOT_FOUND) {
-        DEBUG_FUNCTION_LINE_VERBOSE("Language value not found, attempting to create");
-
-        // Add the value to the storage.
-        res = WUPSStorageAPI_StoreU32(nullptr, "language", Config::language);
-        if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-    } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-
-    res = WUPSStorageAPI_GetBool(nullptr, "show_startup_toast", &Config::show_startup_toast);
-    if (res == WUPS_STORAGE_ERROR_NOT_FOUND) {
-        DEBUG_FUNCTION_LINE_VERBOSE("Show startup toast value not found, attempting to create");
-
-        // Add the value to the storage if it's missing.
-        res = WUPSStorageAPI_StoreBool(nullptr, "show_startup_toast", show_startup_toast);
-        if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-    } else if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
-
-    // Set the language that's currently used
-    if (Config::language == inkay_language::System)
-        Config::current_language = (inkay_language) get_system_language();
-    else
-        Config::current_language = (inkay_language) Config::language;
 
     // Save storage
-    res = WUPSStorageAPI_SaveStorage(false);
+    res = WUPSStorageAPI::SaveStorage();
     if (res != WUPS_STORAGE_ERROR_SUCCESS) return report_storage_error(res);
 }

plugin/src/config.h

@@ -5,18 +5,12 @@
 #ifndef INKAY_CONFIG_H
 #define INKAY_CONFIG_H
 
-#include <stdint.h>
-#include "lang.h"
-
 class Config {
 public:
     static void Init();
 
     // wups config items
     static bool connect_to_network;
-    static uint32_t language;
-
-    static bool show_startup_toast;
 
     // private stuff
     static bool need_relaunch;
@@ -24,7 +18,6 @@ public:
     // private stuff
     static bool is_wiiu_menu;
 
-    static inkay_language current_language;
     static bool unregister_task_item_pressed;
 };
 

plugin/src/main.cpp

@@ -21,108 +21,27 @@
 #include <notifications/notifications.h>
 #include <utils/logger.h>
 #include "config.h"
-#include<coreinit/title.h>
-#include<coreinit/dynload.h>
-#include<vector>
 #include "module.h"
 
-#define INKAY_VERSION "v3.1.0"
+#define INKAY_VERSION "v3.0.0"
 
 /**
     Mandatory plugin information.
     If not set correctly, the loader will refuse to use the plugin.
 **/
-WUPS_META(name, "Malamar (SPFN)");
+WUPS_PLUGIN_NAME("Inkay");
-WUPS_META(wups, WUPS_VERSION_STR);
+WUPS_PLUGIN_DESCRIPTION("Pretendo Network Patcher");
-WUPS_USE_WUT_MALLOC();
-WUPS_USE_WUT_SOCKETS();
-WUPS_USE_WUT_NEWLIB();
-WUPS___INIT_WRAPPER();
-WUPS___FINI_WRAPPER();
-WUPS_INIT_CONFIG_FUNCTIONS();
-WUPS_META(buildtimestamp, __DATE__ " " __TIME__);
-extern const char wups_meta_plugin_name[] WUPS_SECTION("meta");
-const char wups_meta_plugin_name[] = "Malamar (SPFN)";
-extern const char wups_meta_info_dump[] WUPS_SECTION("meta");
-const char wups_meta_info_dump[] = "(plugin: Malamar (SPFN);" \
-                                    "wups " WUPS_VERSION_STR ";" \
-                                    "buildtime: " __DATE__ " " __TIME__ ")";
-extern const char wups_meta_info_linking_order[] WUPS_SECTION("meta");
-const char wups_meta_info_linking_order[] = "Loading \"Malamar (SPFN)\" failed.\n" \
-                                                "Function \"wut_get_thread_specific\" returned unexpected value.\n" \
-                                                "Please check linking order (expected \"-lwups -lwut\")";
-
-WUPS_PLUGIN_DESCRIPTION("SPFN Network Patcher");
 WUPS_PLUGIN_VERSION(INKAY_VERSION);
-WUPS_PLUGIN_AUTHOR("redbinder0526, kittentm and Pretendo contributors");
+WUPS_PLUGIN_AUTHOR("Pretendo contributors");
 WUPS_PLUGIN_LICENSE("GPLv3");
 
 WUPS_USE_STORAGE("inkay");
 
 WUPS_USE_WUT_DEVOPTAB();
 
-bool is_current_game_splatoon(){
-  auto current_game = OSGetTitleID();
-
-  if(
-    current_game == 0x0005000010162B00 ||
-    current_game == 0x0005000010176900 ||
-    current_game == 0x0005000010176A00
-  ){
-    return true;
-  }
-  return false;
-}
-
-void splatoon_patcher(){
-    if (!Config::connect_to_network) {
-        DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Splatoon patches skipped");
-        return;
-    }
-  if(is_current_game_splatoon()){
-    NotificationModule_AddInfoNotification("Splatoon Detected, applying patch");
-    
-    auto rpl_count = OSDynLoad_GetNumberOfRPLs();
-
-    std::vector<OSDynLoad_NotifyData> rpls(rpl_count);
-
-    if(!OSDynLoad_GetRPLInfo(0, rpl_count, rpls.data())){
-      NotificationModule_AddInfoNotification("failed to get rpls");  
-    }
-
-    for(auto rpl: rpls){
-      if(rpl.name != 0){
-        if(strstr(rpl.name, "Gambit") != NULL){
-          NotificationModule_AddInfoNotification(rpl.name);
-          auto text_color = NMColor();
-          text_color.r = 255;
-          text_color.g = 255;
-          text_color.b = 255;
-          text_color.a = 255;
-
-          auto bg_color = NMColor();
-          bg_color.r = 0;
-          bg_color.g = 0;
-          bg_color.b = 0;
-          bg_color.a = 0;
-
-          NotificationModule_AddInfoNotificationEx(rpl.name, 30.0f, text_color, bg_color, nullptr, nullptr, true);
-
-          NotificationModule_AddInfoNotification("applying patches!!!!");
-
-          void* game_data_region = (void*)rpl.dataAddr;
-
-          auto str_loc = (char*)(0x000009ac + (uint32_t)game_data_region);
-
-          strcpy(str_loc, "https://splatpost.spbr.net/post");
-        }
-      }
-    }
-  }
-}
-
 INITIALIZE_PLUGIN() {
     WHBLogCafeInit();
+    WHBLogUdpInit();
 
     Config::Init();
 
@@ -131,7 +50,7 @@ INITIALIZE_PLUGIN() {
     }
 
     // if using pretendo then (try to) apply the ssl patches
-    Inkay_Initialize(Config::connect_to_network, Config::show_startup_toast);
+    Inkay_Initialize(Config::connect_to_network);
 }
 
 DEINITIALIZE_PLUGIN() {
@@ -139,11 +58,11 @@ DEINITIALIZE_PLUGIN() {
     NotificationModule_DeInitLibrary();
 
     WHBLogCafeDeinit();
+    WHBLogUdpDeinit();
 }
 
 ON_APPLICATION_START() {
     // Tell the module the plugin is running!
-    splatoon_patcher();
     Inkay_SetPluginRunning();
 }
 

plugin/src/module.cpp

@@ -18,25 +18,25 @@
 
 #include "Notification.h"
 #include "utils/logger.h"
-#include "config.h"
+#include "sysconfig.h"
 #include "lang.h"
 
 #include <coreinit/dynload.h>
 
 static OSDynLoad_Module module;
-static void (*moduleInitialize)(bool, bool, inkay_language) = nullptr;
+static void (*moduleInitialize)(bool) = nullptr;
 static InkayStatus (*moduleGetStatus)() = nullptr;
 static void (*moduleSetPluginRunning)() = nullptr;
 
 static const char *get_module_not_found_message() {
-    return get_config_strings(Config::current_language).module_not_found.data();
+    return get_config_strings(get_system_language()).module_not_found.data();
 }
 
 static const char *get_module_init_not_found_message() {
-    return get_config_strings(Config::current_language).module_init_not_found.data();
+    return get_config_strings(get_system_language()).module_init_not_found.data();
 }
 
-void Inkay_Initialize(bool apply_patches, bool show_startup_toast) {
+void Inkay_Initialize(bool apply_patches) {
     if (module) {
         return;
     }
@@ -48,13 +48,13 @@ void Inkay_Initialize(bool apply_patches, bool show_startup_toast) {
     }
 
     if (OSDynLoad_FindExport(module, OS_DYNLOAD_EXPORT_FUNC, "Inkay_Initialize", reinterpret_cast<void * *>(&moduleInitialize)) != OS_DYNLOAD_OK) {
-        DEBUG_FUNCTION_LINE("Failed to find function %s", "Inkay_Initialize");
+        DEBUG_FUNCTION_LINE("Failed to find initialization function");
         ShowNotification(get_module_init_not_found_message());
         OSDynLoad_Release(module);
         return;
     }
 
-    moduleInitialize(apply_patches, show_startup_toast, Config::current_language);
+    moduleInitialize(apply_patches);
 }
 
 void Inkay_Finalize() {
@@ -72,7 +72,7 @@ InkayStatus Inkay_GetStatus() {
     }
 
     if (!moduleGetStatus && OSDynLoad_FindExport(module, OS_DYNLOAD_EXPORT_FUNC, "Inkay_GetStatus", reinterpret_cast<void * *>(&moduleGetStatus)) != OS_DYNLOAD_OK) {
-        DEBUG_FUNCTION_LINE("Failed to find function %s", "Inkay_GetStatus");
+        DEBUG_FUNCTION_LINE("Failed to find status function");
         return InkayStatus::Error;
     }
 
@@ -85,7 +85,7 @@ void Inkay_SetPluginRunning() {
     }
 
     if (!moduleSetPluginRunning && OSDynLoad_FindExport(module, OS_DYNLOAD_EXPORT_FUNC, "Inkay_SetPluginRunning", reinterpret_cast<void * *>(&moduleSetPluginRunning)) != OS_DYNLOAD_OK) {
-        DEBUG_FUNCTION_LINE("Failed to find function %s", "Inkay_SetPluginRunning");
+        DEBUG_FUNCTION_LINE("Failed to find \"Inkay_SetPluginRunning\" function");
         return;
     }
 

plugin/src/module.h

@@ -24,7 +24,7 @@ enum class InkayStatus {
     Error = -1     ///< Failed to retrieve the module status
 };
 
-void Inkay_Initialize(bool apply_patches, bool show_startup_toast);
+void Inkay_Initialize(bool apply_patches);
 void Inkay_Finalize();
 InkayStatus Inkay_GetStatus();
 void Inkay_SetPluginRunning();

renovate.json

@@ -1,3 +0,0 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}

src/config.cpp

@@ -18,7 +18,6 @@
 #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;

src/config.h

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

src/iosu_url_patches.h

@@ -8,35 +8,35 @@ typedef struct URL_Patch {
 
 static const URL_Patch url_patches[] = {
         //nim-boss .rodata
-        {0xE2282550, "http://pushmorewupshop.spbr.net/pushmore/r/%s"},
+        {0xE2282550, "http://pushmore.wup.shop.pretendo.cc/pushmore/r/%s"},
-        {0xE229A0A0, "http://npns-devcapp.spbr.net/bst.dat"},
+        {0xE229A0A0, "http://npns-dev.c.app.pretendo.cc/bst.dat"},
-        {0xE229A0D0, "http://npns-devcapp.spbr.net/bst2.dat"},
+        {0xE229A0D0, "http://npns-dev.c.app.pretendo.cc/bst2.dat"},
-        {0xE2281964, "https://tagayawupshop.spbr.net/tagaya/versionlist/%s/%s/%s"},
+        {0xE2281964, "https://tagaya.wup.shop.pretendo.cc/tagaya/versionlist/%s/%s/%s"},
-        {0xE22819B4, "https://tagayawupshop.spbr.net/tagaya/versionlist/%s/%s/latest_version"},
+        {0xE22819B4, "https://tagaya.wup.shop.pretendo.cc/tagaya/versionlist/%s/%s/latest_version"},
-        {0xE2282584, "http://pushmowupshop.spbr.net/pushmo/d/%s/%u"},
+        {0xE2282584, "http://pushmo.wup.shop.pretendo.cc/pushmo/d/%s/%u"},
-        {0xE22825B8, "http://pushmowupshop.spbr.net/pushmo/c/%u/%u"},
+        {0xE22825B8, "http://pushmo.wup.shop.pretendo.cc/pushmo/c/%u/%u"},
-        {0xE2282DB4, "https://ecswupshop.spbr.net/ecs/services/ECommerceSOAP"},
+        {0xE2282DB4, "https://ecs.wup.shop.pretendo.cc/ecs/services/ECommerceSOAP"},
-        {0xE22830A0, "https://ecswupshop.spbr.net/ecs/services/ECommerceSOAP"},
+        {0xE22830A0, "https://ecs.wup.shop.pretendo.cc/ecs/services/ECommerceSOAP"},
-        {0xE22830E0, "https://nuswupshop.spbr.net/nus/services/NetUpdateSOAP"},
+        {0xE22830E0, "https://nus.wup.shop.pretendo.cc/nus/services/NetUpdateSOAP"},
-        {0xE2299990, "policylist.spbr.net"},
+        {0xE2299990, "nppl.app.pretendo.cc"},
-        {0xE229A600, "https://plswupshop.spbr.net/pls/upload"},
+        {0xE229A600, "https://pls.wup.shop.pretendo.cc/pls/upload"},
-        {0xE229A6AC, "https://npvk-devapp.spbr.net/reports"},
+        {0xE229A6AC, "https://npvk-dev.app.pretendo.cc/reports"},
-        {0xE229A6D8, "https://npvkapp.spbr.net/reports"},
+        {0xE229A6D8, "https://npvk.app.pretendo.cc/reports"},
-        {0xE229B1F4, "https://tasksheets.spbr.net/p01/tasksheet/%s/%s/%s/%s?c=%s&l=%s"},
+        {0xE229B1F4, "https://npts.app.pretendo.cc/p01/tasksheet/%s/%s/%s/%s?c=%s&l=%s"},
-        {0xE229B238, "https://tasksheets.spbr.net/p01/tasksheet/%s/%s/%s?c=%s&l=%s"},
+        {0xE229B238, "https://npts.app.pretendo.cc/p01/tasksheet/%s/%s/%s?c=%s&l=%s"},
-        {0xE22AB2D8, "https://idbe-wupcdn.spbr.net/icondata/%02X/%016llX.idbe"},
+        {0xE22AB2D8, "https://idbe-wup.cdn.pretendo.cc/icondata/%02X/%016llX.idbe"},
-        {0xE22AB318, "https://idbe-ctrcdn.spbr.net/icondata/%02X/%016llX.idbe"},
+        {0xE22AB318, "https://idbe-ctr.cdn.pretendo.cc/icondata/%02X/%016llX.idbe"},
-        {0xE22AB358, "https://idbe-wupcdn.spbr.net/icondata/%02X/%016llX-%d.idbe"},
+        {0xE22AB358, "https://idbe-wup.cdn.pretendo.cc/icondata/%02X/%016llX-%d.idbe"},
-        {0xE22AB398, "https://idbe-ctrcdn.spbr.net/icondata/%02X/%016llX-%d.idbe"},
+        {0xE22AB398, "https://idbe-ctr.cdn.pretendo.cc/icondata/%02X/%016llX-%d.idbe"},
-        {0xE22B3EF8, "https://ecscshop.spbr.net"},
+        {0xE22B3EF8, "https://ecs.c.shop.pretendo.cc"},
-        {0xE22B3F30, "https://ecscshop.spbr.net/ecs/services/ECommerceSOAP"},
+        {0xE22B3F30, "https://ecs.c.shop.pretendo.cc/ecs/services/ECommerceSOAP"},
-        {0xE22B3F70, "https://iascshop.spbr.net/ias/services/IdentityAuthenticationSOAP"},
+        {0xE22B3F70, "https://ias.c.shop.pretendo.cc/ias/services/IdentityAuthenticationSOAP"},
-        {0xE22B3FBC, "https://cascshop.spbr.net/cas/services/CatalogingSOAP"},
+        {0xE22B3FBC, "https://cas.c.shop.pretendo.cc/cas/services/CatalogingSOAP"},
-        {0xE22B3FFC, "https://nuscshop.spbr.net/nus/services/NetUpdateSOAP"},
+        {0xE22B3FFC, "https://nus.c.shop.pretendo.cc/nus/services/NetUpdateSOAP"},
-        {0xE229DE0C, "n.app.spbr.net"},
+        {0xE229DE0C, "n.app.pretendo.cc"},
         //nim-boss .bss
-        {0xE24B8A24, "https://policylist.spbr.net/p01/policylist/1/1/UNK"},
+        {0xE24B8A24, "https://nppl.app.pretendo.cc/p01/policylist/1/1/UNK"},
-        {0xE31930D4, "https://%s%saccount.spbr.net/v%u/api/"}
+        {0xE31930D4, "https://%s%saccount.pretendo.cc/v%u/api/"}
 
 };
 

src/lang/de_DE.lang

@@ -1,18 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Netzwerkauswahl"
-,.connect_to_network_setting="Verbinde zum SPFN"
+,.connect_to_network_setting="Mit Pretendo Network verbinden"
 ,.other_category="Andere Einstellungen"
 ,.reset_wwp_setting="Wara Wara Plaza zurücksetzen"
 ,.press_a_action="Drücke A"
 ,.restart_to_apply_action="Neustarten zum Anwenden"
 ,.need_menu_action="Nur vom Wii U-Menü aus"
 ,.using_nintendo_network="Nutze Nintendo Network"
-,.using_pretendo_network="Nutze SPFN"
+,.using_pretendo_network="Nutze Pretendo Network"
 ,.multiplayer_port_display="Nutze UDP Port %hu für Mehrspieler"
-,.module_not_found="SPFN Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)"
+,.module_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1001 Module missing)"
-,.module_init_not_found="SPFN Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)"
+,.module_init_not_found="Pretendo Network Patch fehlgeschlagen - nutze Aroma Updater zum Reparieren (686-1002 Module init)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Deutsch"
-,.system_language=""

src/lang/en@uwu.lang

@@ -1,7 +1,8 @@
+
+
 .plugin_name="Inky ^w^"
 ,.network_category="Newowk sewectiown! :3"
 ,.connect_to_network_setting="use dah pretender!!!!"
-,.show_startup_toast_setting="show da deets :3"
 ,.other_category="oth3r stuffzz"
 ,.reset_wwp_setting="warah wara go BYEBYE x3c"
 ,.press_a_action="Press A plz?"
@@ -12,8 +13,3 @@
 ,.multiplayer_port_display="mah secret word is %hu... ur modem will know"
 ,.module_not_found="oh noez! pls get aroma updater help :( (686-1001 Module missing)"
 ,.module_init_not_found="oh noez! pls get aroma updater help :( (686-1002 Module init)"
-,.setting_yes="yaah!"
-,.setting_no="nu >w<"
-,.language_setting="spek..."
-,.language_name="kitteh speak!!"
-,.system_language="System"

src/lang/en_US.lang

@@ -1,19 +1,13 @@
-.plugin_name="Malamar"
+.plugin_name="Inkay"
 ,.network_category="Network selection"
-,.connect_to_network_setting="Connect to SPFN"
+,.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"
 ,.restart_to_apply_action="Restart to apply"
 ,.need_menu_action="From WiiU menu only"
 ,.using_nintendo_network="Using Nintendo Network"
-,.using_pretendo_network="Using SPFN"
+,.using_pretendo_network="Using Pretendo Network"
 ,.multiplayer_port_display="Using UDP port %hu for multiplayer"
-,.module_not_found="SPFN patch failed - use Aroma Updater to repair (686-1001 Module missing)"
+,.module_not_found="Pretendo Network patch failed - use Aroma Updater to repair (686-1001 Module missing)"
-,.module_init_not_found="SPFN patch failed - use Aroma Updater to repair (686-1002 Module init)"
+,.module_init_not_found="Pretendo Network patch failed - use Aroma Updater to repair (686-1002 Module init)"
-,.setting_yes="Yes"
-,.setting_no="No"
-,.language_setting="Language"
-,.language_name="English"
-,.system_language="System"

src/lang/es_ES.lang

@@ -1,19 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Seleccionar red"
-,.connect_to_network_setting="Conectar a SPFN"
+,.connect_to_network_setting="Conectar a Pretendo Network"
-,.show_startup_toast_setting=""
 ,.other_category="Otros ajustes"
 ,.reset_wwp_setting="Restablecer Plaza Wara Wara"
 ,.press_a_action="Pulsa A"
 ,.restart_to_apply_action="Reiniciar para aplicar"
 ,.need_menu_action="Solo desde el Menú de Wii U"
 ,.using_nintendo_network="Usando Nintendo Network"
-,.using_pretendo_network="Usando SPFN"
+,.using_pretendo_network="Usando Pretendo Network"
 ,.multiplayer_port_display="Usando puerto UDP %hu para multijugador"
-,.module_not_found="Ha fallado el parche SPFN - usa Aroma Updater para repararlo (686-1001 Falta un módulo)"
+,.module_not_found="Ha fallado el parche Pretendo Network - usa Aroma Updater para repararlo (686-1001 Falta un módulo)"
-,.module_init_not_found="Ha fallado el parche SPFN - usa Aroma Updater para repararlo (686-1002 Inicialización del módulo)"
+,.module_init_not_found="Ha fallado el parche Pretendo Network - usa Aroma Updater para repararlo (686-1002 Inicialización del módulo)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Español"
-,.system_language=""

src/lang/fr_FR.lang

@@ -1,18 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Sélection du réseau"
-,.connect_to_network_setting="Connexion au SPFN"
+,.connect_to_network_setting="Connexion au Pretendo Network"
 ,.other_category="Autres paramètres"
 ,.reset_wwp_setting="Réinitialiser la place WaraWara"
 ,.press_a_action="Appuyez sur A"
 ,.restart_to_apply_action="Redémarrer pour appliquer"
 ,.need_menu_action="(retournez d'abord au menu Wii U)"
 ,.using_nintendo_network="Réseau sélectionné : Nintendo Network"
-,.using_pretendo_network="Réseau sélectionné : SPFN"
+,.using_pretendo_network="Réseau sélectionné : Pretendo Network"
 ,.multiplayer_port_display="Le port UDP %hu sera utilisé pour le multijoueur"
-,.module_not_found="Le patch SPFN a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1001 Module missing)"
+,.module_not_found="Le patch Pretendo Network a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1001 Module missing)"
-,.module_init_not_found="Le patch SPFN a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1002 Module init)"
+,.module_init_not_found="Le patch Pretendo Network a rencontré un problème, veuillez le réparer avec Aroma Updater (686-1002 Module init)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Français"
-,.system_language=""

src/lang/it_IT.lang

@@ -1,19 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Seleziona la rete"
-,.connect_to_network_setting="Connettiti a SPFN"
+,.connect_to_network_setting="Connettiti a Pretendo Network"
-,.show_startup_toast_setting=""
 ,.other_category="Altre impostazioni"
 ,.reset_wwp_setting="Ripristina Wara Wara Plaza"
 ,.press_a_action="Premi A"
 ,.restart_to_apply_action="Riavvia per applicare"
 ,.need_menu_action="Solo dal menu WiiU"
 ,.using_nintendo_network="In uso Nintendo Network"
-,.using_pretendo_network="In uso SPFN"
+,.using_pretendo_network="In uso Pretendo Network"
 ,.multiplayer_port_display="È in uso la porta UDP %hu per il multigiocatore"
-,.module_not_found="Patch di SPFN fallita - usa Aroma Updater per correggere (686-1001 Modulo mancante)"
+,.module_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1001 Modulo mancante)"
-,.module_init_not_found="Patch di SPFN fallita - usa Aroma Updater per correggere (686-1002 Module init)"
+,.module_init_not_found="Patch Pretendo Network fallita - usa Aroma Updater per riparare (686-1002 Module init)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Italiano"
-,.system_language=""

src/lang/ja_JP.lang

@@ -1,19 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="ネットワークの選択"
-,.connect_to_network_setting="SPFNネットワークに接続する"
+,.connect_to_network_setting="Pretendoネットワークに接続する"
-,.show_startup_toast_setting=""
 ,.other_category="その他の設定"
 ,.reset_wwp_setting="わらわら広場をリセット"
 ,.press_a_action="Ａボタンを押そう"
 ,.restart_to_apply_action="再起動後に反映されます"
 ,.need_menu_action="Wii Uメニューからのみ実行可能"
 ,.using_nintendo_network="選択済み：ニンテンドーネットワーク"
-,.using_pretendo_network="選択済み：SPFN ネットワーク"
+,.using_pretendo_network="選択済み：Pretendo ネットワーク"
 ,.multiplayer_port_display="マルチプレイに UDPポート %hu を使用します"
-,.module_not_found="SPFN パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1001 Module missing)"
+,.module_not_found="Pretendo パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1001 Module missing)"
-,.module_init_not_found="SPFN パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1002 Module init)"
+,.module_init_not_found="Pretendo パッチに失敗しました。Aroma Updaterを使用して解決してみてください。(686-1002 Module init)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="日本語"
-,.system_language=""

src/lang/ko_KR.lang

@@ -1,19 +0,0 @@
-.plugin_name="Inkay"
-,.network_category="네트워크 선택"
-,.connect_to_network_setting="SPFN 사용"
-,.show_startup_toast_setting=""
-,.other_category="기타 설정"
-,.reset_wwp_setting="Wara Wara Plaza 초기화"
-,.press_a_action="A 버튼을 누르세요"
-,.restart_to_apply_action="재시작 후 적용"
-,.need_menu_action="Wii U 메뉴에서만"
-,.using_nintendo_network="Nintendo Network 사용 중"
-,.using_pretendo_network="SPFN 사용 중"
-,.multiplayer_port_display="멀티플레이어에 UDP 포트 %hu을(를) 사용합니다"
-,.module_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1001 모듈 없음)"
-,.module_init_not_found="패치를 적용하는 데 실패했습니다. Aroma Updater로 복구해 주세요. (686-1002 모듈 초기화)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="한국어"
-,.system_language=""

src/lang/nl_NL.lang

@@ -1,19 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Netwerkselectie"
-,.connect_to_network_setting="Verbind met het SPFN-netwerk"
+,.connect_to_network_setting="Verbind met het Pretendo-netwerk"
-,.show_startup_toast_setting=""
 ,.other_category="Overige instellingen"
 ,.reset_wwp_setting="Reset het Wara Wara Plaza"
 ,.press_a_action="Druk A"
 ,.restart_to_apply_action="Herstart om toe te passen"
 ,.need_menu_action="Alleen vanuit het WiiU-menu"
 ,.using_nintendo_network="Nintendo Network wordt gebruikt"
-,.using_pretendo_network="SPFN wordt gebruikt"
+,.using_pretendo_network="Pretendo Network wordt gebruikt"
 ,.multiplayer_port_display="Gebruikt UDP port %hu voor multiplayer"
-,.module_not_found="SPFN patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)"
+,.module_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1001 Module ontbreekt)"
-,.module_init_not_found="SPFN patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)"
+,.module_init_not_found="Pretendo patch mislukt - gebruik Aroma Updater om het te herstellen (686-1002 Module init)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Nederlands"
-,.system_language=""

src/lang/pt_BR.lang

@@ -1,19 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Selecionar rede"
-,.connect_to_network_setting="Conecta-se à SPFN"
+,.connect_to_network_setting="Conecta-se à Pretendo Network"
-,.show_startup_toast_setting=""
 ,.other_category="Outras configurações"
 ,.reset_wwp_setting="Resetar Wara Wara Plaza"
 ,.press_a_action="Aperte A"
 ,.restart_to_apply_action="Reinicie para aplicar"
 ,.need_menu_action="Apenas no menu do Wii U"
 ,.using_nintendo_network="Usando Nintendo Network"
-,.using_pretendo_network="Usando SPFN"
+,.using_pretendo_network="Usando Pretendo Network"
 ,.multiplayer_port_display="Usando UDP port %hu para a jogatina multiplayer"
-,.module_not_found="Atualização do SPFN falhou - use o Aroma Updater para corrigir (686-1001 Módulo faltando)"
+,.module_not_found="Atualização do Pretendo falhou - use o Aroma Updater para corrigir (686-1001 Módulo faltando)"
-,.module_init_not_found="Atualização do SPFN falhou - use o Aroma Updater para corrigir (686-1002 Módulo de início)"
+,.module_init_not_found="Atualização do Pretendo falhou - use o Aroma Updater para corrigir (686-1002 Módulo de início)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Português"
-,.system_language=""

src/lang/ru_RU.lang

@@ -1,19 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="Выбор сети"
-,.connect_to_network_setting="Подключиться к SPFN"
+,.connect_to_network_setting="Подключиться к Pretendo Network"
-,.show_startup_toast_setting=""
 ,.other_category="Другие настройки"
 ,.reset_wwp_setting="Сбросить Wara Wara Plaza"
 ,.press_a_action="Нажмите A"
 ,.restart_to_apply_action="Перезагрузите для применения изменений"
 ,.need_menu_action="Только из меню Wii U"
 ,.using_nintendo_network="Используется Nintendo Network"
-,.using_pretendo_network="Используется SPFN"
+,.using_pretendo_network="Используется Pretendo Network"
 ,.multiplayer_port_display="Используем UDP-порт %hu для сетевой игры"
-,.module_not_found="Ошибка установки патча SPFN - для восстановления, запустите Aroma Updater (686-1001 Модуль отсутствует)"
+,.module_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1001 Модуль отсутствует)"
-,.module_init_not_found="Ошибка установки патча SPFN - для восстановления, запустите Aroma Updater (686-1002 Инициализация модуля)"
+,.module_init_not_found="Ошибка установки патча Pretendo - для восстановления, запустите Aroma Updater (686-1002 Инициализация модуля)"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="Русский язык"
-,.system_language=""

src/lang/zh_CN.lang

@@ -1,18 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="选择网络"
-,.connect_to_network_setting="连接到SPFN"
+,.connect_to_network_setting="连接到Pretendo Network"
 ,.other_category="其他设置"
 ,.reset_wwp_setting="重置Wara Wara Plaza"
 ,.press_a_action="请按 A"
 ,.restart_to_apply_action="重启以应用设置"
 ,.need_menu_action="仅来自WiiU Menu"
 ,.using_nintendo_network="使用 Nintendo Network"
-,.using_pretendo_network="使用 SPFN"
+,.using_pretendo_network="使用 Pretendo Network"
 ,.multiplayer_port_display="多人游戏使用 UDP 端口 %hu"
-,.module_not_found="SPFN 补丁失败 - 使用 Aroma Updater 修复（686-1001 模块丢失）"
+,.module_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1001 模块丢失）"
-,.module_init_not_found="SPFN 补丁失败 - 使用 Aroma Updater 修复（686-1002 模块初始化）"
+,.module_init_not_found="Pretendo Network 补丁失败 - 使用 Aroma Updater 修复（686-1002 模块初始化）"
-,.setting_yes=""
-,.setting_no=""
-,.language_setting=""
-,.language_name="中文（简体）"
-,.system_language=""

src/lang/zh_Hant.lang

@@ -1,20 +1,13 @@
 .plugin_name="Inkay"
 ,.network_category="選擇網路"
-,.connect_to_network_setting="連接到SPFN"
+,.connect_to_network_setting="連接到Pretendo Network"
-,.show_startup_toast_setting=""
 ,.other_category="其他設定"
 ,.reset_wwp_setting="重置Wara Wara Plaza"
 ,.press_a_action="請按 A"
 ,.restart_to_apply_action="重啓以套用設定"
 ,.need_menu_action="僅來自WiiU Menu"
 ,.using_nintendo_network="使用 Nintendo Network"
-,.using_pretendo_network="使用 SPFN"
+,.using_pretendo_network="使用 Pretendo Network"
-,.multiplayer_port_display="Using UDP port %hu for multiplayer"
-,.module_not_found="SPFN patch failed - use Aroma Updater to repair (686-1001 Module missing)"
-,.module_init_not_found="SPFN patch failed - use Aroma Updater to repair (686-1002 Module init)"
 ,.multiplayer_port_display="使用 UDP 端口 %hu 進行多人遊戲"
-,.setting_yes=""
+,.module_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1001 模組）"
-,.setting_no=""
+,.module_init_not_found="Pretendo Network 補丁失敗 - 請使用 Aroma Updater 修復（缺少 686-1002 模組）"
-,.language_setting=""
-,.language_name="中文（繁體）"
-,.system_language=""

src/main.cpp

@@ -39,34 +39,16 @@
 
 #include "ca_pem.h"
 
-#define INKAY_VERSION "v3.1.0"
+#define INKAY_VERSION "v3.0.0"
 
 /**
     Mandatory plugin information.
     If not set correctly, the loader will refuse to use the plugin.
 **/
-WUMS_META(export_name, "inkay");
+WUMS_MODULE_EXPORT_NAME("inkay");
-WUMS_META(wums, WUMS_VERSION);
+WUMS_MODULE_DESCRIPTION("Pretendo Network Patcher");
-WUMS_USE_WUT_MALLOC();
-WUMS_USE_WUT_SOCKETS();
-WUMS_USE_WUT_NEWLIB();
-WUMS___INIT_WRAPPER();
-WUMS___FINI_WRAPPER();
-WUMS_META(buildtimestamp, __DATE__ " " __TIME__);
-extern const char wums_meta_module_name[] WUMS_SECTION("meta");
-const char wums_meta_module_name[] = "inkay";
-extern const char wums_meta_info_dump[] WUMS_SECTION("meta");
-const char wums_meta_info_dump[] = "(module: inkay;" \
-                                    "wums " WUMS_VERSION ";" \
-                                    "buildtime: " __DATE__ " " __TIME__ ")";
-extern const char wums_meta_info_linking_order[] WUMS_SECTION("meta");
-const char wums_meta_info_linking_order[] = "Loading module \"inkay\" failed.\n" \
-                                                "Function \"wut_get_thread_specific\" returned unexpected value.\n" \
-                                                "Please check linking order (expected \"-lwums -lwut\")";
-
-WUMS_MODULE_DESCRIPTION("SPFN Network Patcher");
 WUMS_MODULE_VERSION(INKAY_VERSION);
-WUMS_MODULE_AUTHOR("Pretendo contributors and RusticMaple");
+WUMS_MODULE_AUTHOR("Pretendo contributors");
 WUMS_MODULE_LICENSE("GPLv3");
 
 WUMS_DEPENDS_ON(homebrew_functionpatcher);
@@ -111,18 +93,18 @@ static bool is555(MCPSystemVersion version) {
     return (version.major == 5) && (version.minor == 5) && (version.patch >= 5);
 }
 
-static const char *get_nintendo_network_message(inkay_language language) {
+static const char *get_nintendo_network_message() {
     // TL note: "Nintendo Network" is a proper noun - "Network" is part of the name
     // TL note: "Using" instead of "Connected" is deliberate - we don't know if a successful connection exists, we are
     // only specifying what we'll *attempt* to connect to
-    return get_config_strings(language).using_nintendo_network.data();
+    return get_config_strings(get_system_language()).using_nintendo_network.data();
 }
 
-static const char *get_pretendo_message(inkay_language language) {
+static const char *get_pretendo_message() {
     // TL note: "Pretendo Network" is also a proper noun - though "Pretendo" alone can refer to us as a project
     // TL note: "Using" instead of "Connected" is deliberate - we don't know if a successful connection exists, we are
     // only specifying what we'll *attempt* to connect to
-    return get_config_strings(language).using_pretendo_network.data();
+    return get_config_strings(get_system_language()).using_pretendo_network.data();
 }
 
 static void Inkay_SetPluginRunning() {
@@ -140,12 +122,10 @@ static InkayStatus Inkay_GetStatus() {
     }
 }
 
-static void Inkay_Initialize(bool apply_patches, bool show_startup_toast, inkay_language language) {
+static void Inkay_Initialize(bool apply_patches) {
     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;
@@ -170,16 +150,12 @@ static void Inkay_Initialize(bool apply_patches, bool show_startup_toast, inkay_
 
         DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches applied successfully.");
 
-        if (Config::show_startup_toast) {
+        ShowNotification(get_pretendo_message());
-            ShowNotification(get_pretendo_message(language));
-        }
         Config::initialized = true;
     } else {
         DEBUG_FUNCTION_LINE_VERBOSE("Pretendo URL and NoSSL patches skipped.");
 
-        if(Config::show_startup_toast) {
+        ShowNotification(get_nintendo_network_message());
-            ShowNotification(get_nintendo_network_message(language));
-        }
         Config::initialized = true;
         return;
     }

src/patches/olv_applet.cpp

@@ -46,7 +46,7 @@ constexpr struct olv_allowlist original_entry = {
 
 constexpr struct olv_allowlist new_entry = {
     .scheme = "https",
-    .domain = ".spbr.net",
+    .domain = "." NETWORK_BASEURL,
     .path = "",
     .flags = {1, 1, 1, 1, 1},
 };
@@ -77,7 +77,6 @@ const replacement replacements[] = {
 };
 
 static std::optional<FSFileHandle> rootca_pem_handle{};
-static std::optional<FSFileHandle> valid_tld_handle{};
 std::vector<PatchedFunctionHandle> olv_patches;
 
 DECL_FUNCTION(int, FSOpenFile, FSClient *client, FSCmdBlock *block, char *path, const char *mode, uint32_t *handle,
@@ -107,74 +106,33 @@ DECL_FUNCTION(int, FSOpenFile, FSClient *client, FSCmdBlock *block, char *path,
         DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Found Miiverse CA, replacing...");
         return ret;
     }
-    else if (strcmp("vol/content/browser/effective_tld_names.dat", path) == 0)
-    {
-        // we patch the TLD because .cafe isnt on the list
-        int ret = real_FSOpenFile(client, block, path, mode, handle, error);
-        valid_tld_handle = *handle;
-        DEBUG_FUNCTION_LINE_VERBOSE("Inkay: Found Miiverse TLD List, patching...");
-        return ret;
-    }
 
     return real_FSOpenFile(client, block, path, mode, handle, error);
 }
 
 DECL_FUNCTION(FSStatus, FSReadFile, FSClient *client, FSCmdBlock *block, uint8_t *buffer, uint32_t size, uint32_t count,
-              FSFileHandle handle, uint32_t unk1, uint32_t flags)
+              FSFileHandle handle, uint32_t unk1, uint32_t flags) {
-{
+    if (size != 1) {
-    if (size != 1)
+        DEBUG_FUNCTION_LINE("Inkay: Miiverse CA replacement failed!");
-    {
-        DEBUG_FUNCTION_LINE("Inkay: Miiverse CA/LTD replacement failed!");
     }
 
-    if (rootca_pem_handle && *rootca_pem_handle == handle)
+    if (rootca_pem_handle && *rootca_pem_handle == handle) {
-    {
         strlcpy((char *) buffer, (const char *) ca_pem, size * count);
 
         //this can't be done above (in the FSOpenFile hook) since it's not loaded yet.
         //the hardcoded offsets suck but they really are at Random Places In The Heap
+        replaceBulk(0x11000000, 0x02000000, replacements);
         return (FSStatus) count;
     }
-    else if (valid_tld_handle && *valid_tld_handle == handle)
-    {
-        // we patch the tld "aero"...
-        FSStatus ret = real_FSReadFile(
-            client, block, buffer, size, count, handle, unk1, flags);
-
-        if (ret > 0)
-        {
-            uint32_t totalSize = size * count;
-            char *buf = (char *)buffer;
-
-            for (uint32_t i = 0; i + 4 <= totalSize; i++)
-            {
-                if (memcmp(&buf[i], "aero", 4) == 0)
-                {
-                    memcpy(&buf[i], "cafe", 4);
-
-                    DEBUG_FUNCTION_LINE_VERBOSE(
-                        "Inkay: patched TLD aero -> cafe");
-                }
-            }
-        }
-
-        return ret;
-    }
 
     return real_FSReadFile(client, block, buffer, size, count, handle, unk1, flags);
 }
 
-
 DECL_FUNCTION(FSStatus, FSCloseFile, FSClient *client, FSCmdBlock *block, FSFileHandle handle, FSErrorFlag errorMask) {
     if (handle == rootca_pem_handle) {
         rootca_pem_handle.reset();
     }
 
-    if (handle == valid_tld_handle)
-    {
-        valid_tld_handle.reset();
-    }
-
     return real_FSCloseFile(client, block, handle, errorMask);
 }
 

src/patches/olv_urls.h

@@ -18,9 +18,9 @@
 #include "inkay_config.h"
 
 constexpr char original_url[] = "discovery.olv.nintendo.net/v1/endpoint";
-constexpr char new_url[] =      "discovery.olv.spbr.net/v1/endpoint";
+constexpr char new_url[] =      "discovery.olv." NETWORK_BASEURL "/v1/endpoint";
 
-_Static_assert(sizeof(original_url) >= sizeof(new_url),
+_Static_assert(sizeof(original_url) > sizeof(new_url),
                "new_url too long! Must be less than 38chars.");
 
 bool setup_olv_libs();

src/utils/replace_mem.cpp

@@ -85,6 +85,7 @@ bool replace_unsigned(U *addr, U original_value, U new_value) {
     );
     DCFlushRange(addr, sizeof(new_value));
 
+    DEBUG_FUNCTION_LINE_VERBOSE("%08x is now %08x", inst, *inst);
     return *addr == new_value;
 }
 template bool replace_unsigned<uint64_t>(uint64_t *, uint64_t, uint64_t);