From b38d54eb5fc73b99f66596cf9216da8f5414e8f4 Mon Sep 17 00:00:00 2001 From: Maschell Date: Sun, 24 Jul 2022 07:24:05 +0200 Subject: [PATCH] Use the latest wut version --- Dockerfile | 6 +----- source/main.cpp | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5fbd5d0..fc3a192 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,3 @@ -FROM wiiuenv/devkitppc:20210920 - -COPY --from=wiiuenv/devkitarm:20210917 $DEVKITPRO/devkitARM $DEVKITPRO/devkitARM - -ENV DEVKITARM=/opt/devkitpro/devkitARM +FROM wiiuenv/devkitppc:20220724 WORKDIR project \ No newline at end of file diff --git a/source/main.cpp b/source/main.cpp index 988ae19..63161ab 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,19 +1,15 @@ -#include -#include -#include - -#include - -#include - -#include -#include -#include - #include "ElfUtils.h" #include "ios_exploit.h" #include "utils/logger.h" #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -47,9 +43,6 @@ bool CheckRunning() { return true; } -extern "C" void _SYSLaunchMenuWithCheckingAccount(nn::act::SlotNo slot); -extern "C" void SYSLaunchMiiStudio(void *SysMiiStudioArgs); - int main(int argc, char **argv) { WHBLogUdpInit(); @@ -146,7 +139,7 @@ int main(int argc, char **argv) { } void forceDefaultTitleIDToWiiUMenu() { // Restore the default title id to the normal Wii U Menu. - unsigned long long sysmenuIdUll = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HOME_MENU); + unsigned long long sysmenuIdUll = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_WII_U_MENU); memcpy((void *) 0xF417FFF0, &sysmenuIdUll, 8); DCStoreRange((void *) 0xF417FFF0, 0x8); DEBUG_FUNCTION_LINE("Forcing start of title: %016llX", sysmenuIdUll);