mirror of
https://github.com/wiiu-env/PayloadLoaderInstaller.git
synced 2024-11-23 18:29:20 +01:00
Rename it PayloadLoader Installer
This commit is contained in:
parent
678d63cabb
commit
202f5374aa
6
Makefile
6
Makefile
@ -13,8 +13,8 @@ TOPDIR ?= $(CURDIR)
|
|||||||
# APP_SHORTNAME sets the short name of the application
|
# APP_SHORTNAME sets the short name of the application
|
||||||
# APP_AUTHOR sets the author of the application
|
# APP_AUTHOR sets the author of the application
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
APP_NAME := Aroma Installer
|
APP_NAME := PayloadLoader Installer
|
||||||
APP_SHORTNAME := Aroma Installer
|
APP_SHORTNAME := PayloadLoader Installer
|
||||||
APP_AUTHOR := Maschell, rw, GaryOderNichts
|
APP_AUTHOR := Maschell, rw, GaryOderNichts
|
||||||
|
|
||||||
include $(DEVKITPRO)/wut/share/wut_rules
|
include $(DEVKITPRO)/wut/share/wut_rules
|
||||||
@ -30,7 +30,7 @@ include $(DEVKITPRO)/wut/share/wut_rules
|
|||||||
# TV_SPLASH is the image displayed during bootup on the TV, leave blank to use default rule
|
# TV_SPLASH is the image displayed during bootup on the TV, leave blank to use default rule
|
||||||
# DRC_SPLASH is the image displayed during bootup on the DRC, leave blank to use default rule
|
# DRC_SPLASH is the image displayed during bootup on the DRC, leave blank to use default rule
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
TARGET := AromaInstaller
|
TARGET := PayloadLoaderInstaller
|
||||||
BUILD := build
|
BUILD := build
|
||||||
SOURCES := source \
|
SOURCES := source \
|
||||||
source/common \
|
source/common \
|
||||||
|
@ -21,7 +21,7 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Press A to return to the Wii U Menu.", STATE_EXIT_SYSMENU);
|
menu.addOption("Press A to return to the Wii U Menu.", STATE_EXIT_SYSMENU);
|
||||||
} else if (this->state == STATE_WELCOME_SCREEN) {
|
} else if (this->state == STATE_WELCOME_SCREEN) {
|
||||||
menu.addText("Welcome to the Aroma Installer!");
|
menu.addText("Welcome to the PayloadLoader Installer!");
|
||||||
menu.addText("Do you want to check if an installation is possible?");
|
menu.addText("Do you want to check if an installation is possible?");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Check", STATE_GET_APP_INFORMATION);
|
menu.addOption("Check", STATE_GET_APP_INFORMATION);
|
||||||
@ -33,9 +33,9 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
} else if (this->state == STATE_CHECK_COLDBOOT_STATUS) {
|
} else if (this->state == STATE_CHECK_COLDBOOT_STATUS) {
|
||||||
menu.addText("Check if coldboot can be enabled.");
|
menu.addText("Check if coldboot can be enabled.");
|
||||||
} else if (this->state == STATE_CHECK_REMOVAL_POSSIBLE) {
|
} else if (this->state == STATE_CHECK_REMOVAL_POSSIBLE) {
|
||||||
menu.addText("Check if Aroma can be removed.");
|
menu.addText("Check if PayloadLoader can be removed.");
|
||||||
} else if (this->state == STATE_APP_INCOMPATIBLE) {
|
} else if (this->state == STATE_APP_INCOMPATIBLE) {
|
||||||
menu.addText("Sorry, Aroma cannot be safely installed to:");
|
menu.addText("Sorry, PayloadLoader cannot be safely installed to:");
|
||||||
menu.addText(std::string(appInfo->appName));
|
menu.addText(std::string(appInfo->appName));
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addText("Additional informations:");
|
menu.addText("Additional informations:");
|
||||||
@ -59,7 +59,7 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Exit", STATE_EXIT_SYSMENU);
|
menu.addOption("Exit", STATE_EXIT_SYSMENU);
|
||||||
} else if (this->state == STATE_MAIN_MENU) {
|
} else if (this->state == STATE_MAIN_MENU) {
|
||||||
menu.addText("Aroma " + std::string(this->alreadyInstalledAndUpdated ? "is" : "can be") + " installed to:");
|
menu.addText("PayloadLoader " + std::string(this->alreadyInstalledAndUpdated ? "is" : "can be") + " installed to:");
|
||||||
menu.addText(std::string(appInfo->appName));
|
menu.addText(std::string(appInfo->appName));
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Install / Update", STATE_INSTALL_CONFIRM_DIALOG);
|
menu.addOption("Install / Update", STATE_INSTALL_CONFIRM_DIALOG);
|
||||||
@ -75,13 +75,13 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
menu.addOption("Back", STATE_MAIN_MENU);
|
menu.addOption("Back", STATE_MAIN_MENU);
|
||||||
} else {
|
} else {
|
||||||
if (this->coldbootTitleId == this->appInfo->titleId) {
|
if (this->coldbootTitleId == this->appInfo->titleId) {
|
||||||
menu.addText("Before you can install/update Aroma you need to change");
|
menu.addText("Before you can install/update PayloadLoader you need to change");
|
||||||
menu.addText("the coldboot title back to Wii U Menu");
|
menu.addText("the coldboot title back to Wii U Menu");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Back", STATE_MAIN_MENU);
|
menu.addOption("Back", STATE_MAIN_MENU);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
menu.addText("Are you REALLY sure you want to install Aroma?");
|
menu.addText("Are you REALLY sure you want to install PayloadLoader?");
|
||||||
menu.addText("Installing could permanently damage your console");
|
menu.addText("Installing could permanently damage your console");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addText("After the installation the following app will turn into");
|
menu.addText("After the installation the following app will turn into");
|
||||||
@ -104,17 +104,17 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
} else if (this->state == STATE_INSTALL_RPX) {
|
} else if (this->state == STATE_INSTALL_RPX) {
|
||||||
menu.addText("... install safe.rpx");
|
menu.addText("... install safe.rpx");
|
||||||
} else if (this->state == STATE_INSTALL_SUCCESS) {
|
} else if (this->state == STATE_INSTALL_SUCCESS) {
|
||||||
menu.addText("Aroma was successfully installed");
|
menu.addText("PayloadLoader was successfully installed");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Press A to shutdown the console", STATE_EXIT_SHUTDOWN);
|
menu.addOption("Press A to shutdown the console", STATE_EXIT_SHUTDOWN);
|
||||||
} else if (this->state == STATE_REMOVE_CONFIRM_DIALOG) {
|
} else if (this->state == STATE_REMOVE_CONFIRM_DIALOG) {
|
||||||
if (this->systemXMLAlreadyPatched) {
|
if (this->systemXMLAlreadyPatched) {
|
||||||
menu.addText("Before you can remove Aroma you need to switch");
|
menu.addText("Before you can remove PayloadLoader you need to switch");
|
||||||
menu.addText("the system boot title back to the Wii U Menu");
|
menu.addText("the system boot title back to the Wii U Menu");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Back", STATE_MAIN_MENU);
|
menu.addOption("Back", STATE_MAIN_MENU);
|
||||||
} else {
|
} else {
|
||||||
menu.addText("Are you REALLY sure you want to remove Aroma?");
|
menu.addText("Are you REALLY sure you want to remove PayloadLoader?");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Back", STATE_MAIN_MENU);
|
menu.addOption("Back", STATE_MAIN_MENU);
|
||||||
menu.addOption("Remove", STATE_REMOVE_STARTED);
|
menu.addOption("Remove", STATE_REMOVE_STARTED);
|
||||||
@ -123,10 +123,10 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
menu.addText("Removing...");
|
menu.addText("Removing...");
|
||||||
} else if (this->state == STATE_REMOVE_COLDBOOT) {
|
} else if (this->state == STATE_REMOVE_COLDBOOT) {
|
||||||
menu.addText("... remove system.xml coldboot patches");
|
menu.addText("... remove system.xml coldboot patches");
|
||||||
} else if (this->state == STATE_REMOVE_AROMA) {
|
} else if (this->state == STATE_REMOVE_PAYLOAD_LOADER) {
|
||||||
menu.addText("... remove Aroma application patches");
|
menu.addText("... remove PayloadLoader application patches");
|
||||||
} else if (this->state == STATE_REMOVE_SUCCESS) {
|
} else if (this->state == STATE_REMOVE_SUCCESS) {
|
||||||
menu.addText("Aroma was successfully removed");
|
menu.addText("PayloadLoader was successfully removed");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Press A to shutdown the console", STATE_EXIT_SHUTDOWN);
|
menu.addOption("Press A to shutdown the console", STATE_EXIT_SHUTDOWN);
|
||||||
} else if (this->state == STATE_BOOT_MENU) {
|
} else if (this->state == STATE_BOOT_MENU) {
|
||||||
@ -143,20 +143,19 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
|
|
||||||
menu.addOption("Switch back to Wii U Menu", STATE_BOOT_SWITCH_SYSMENU);
|
menu.addOption("Switch back to Wii U Menu", STATE_BOOT_SWITCH_SYSMENU);
|
||||||
} else if (this->systemXMLPatchAllowed) {
|
} else if (this->systemXMLPatchAllowed) {
|
||||||
menu.addOption("Switch to Aroma", STATE_BOOT_SWITCH_AROMA);
|
menu.addOption("Switch to PayloadLoader", STATE_BOOT_SWITCH_PAYLOAD_LOADER);
|
||||||
} else if (this->systemXMLPatchAllowedButNoRPXCheck) {
|
} else if (this->systemXMLPatchAllowedButNoRPXCheck) {
|
||||||
menu.addText("Your RPX is not as expected. You probably");
|
menu.addText("Your RPX is not as expected. You probably");
|
||||||
menu.addText("need to update or re-install Aroma first.");
|
menu.addText("need to update or re-install PayloadLoader first.");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addOption("Back", STATE_MAIN_MENU);
|
|
||||||
} else if (this->systemXMLPatchPossible) {
|
} else if (this->systemXMLPatchPossible) {
|
||||||
menu.addText("To change the system boot title to Aroma, you need to");
|
menu.addText("To change the system boot title to PayloadLoader, you need to");
|
||||||
menu.addText("launch this installer from an already running Aroma");
|
menu.addText("launch this installer from an already running PayloadLoader");
|
||||||
menu.addText("instance, in order to verify that the installation");
|
menu.addText("instance, in order to verify that the installation");
|
||||||
menu.addText("is working properly.");
|
menu.addText("is working properly.");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
menu.addText("After installing Aroma, reboot the console, open the");
|
menu.addText("After installing PayloadLoader, reboot the console, open the");
|
||||||
menu.addText("Health & Safety app and relaunch the Aroma installer.");
|
menu.addText("Health & Safety app and relaunch the PayloadLoader installer.");
|
||||||
menu.addText();
|
menu.addText();
|
||||||
} else {
|
} else {
|
||||||
menu.addText("Sorry, your system.xml file has not yet been tested");
|
menu.addText("Sorry, your system.xml file has not yet been tested");
|
||||||
@ -164,7 +163,7 @@ void ApplicationState::changeState(eGameState newState) {
|
|||||||
menu.addText();
|
menu.addText();
|
||||||
}
|
}
|
||||||
menu.addOption("Back", STATE_MAIN_MENU);
|
menu.addOption("Back", STATE_MAIN_MENU);
|
||||||
} else if (this->state == STATE_BOOT_SWITCH_AROMA) {
|
} else if (this->state == STATE_BOOT_SWITCH_PAYLOAD_LOADER) {
|
||||||
menu.addText("Changing system.xml to boot " + std::string(this->appInfo->appName) + " ...");
|
menu.addText("Changing system.xml to boot " + std::string(this->appInfo->appName) + " ...");
|
||||||
} else if (this->state == STATE_BOOT_SWITCH_SYSMENU) {
|
} else if (this->state == STATE_BOOT_SWITCH_SYSMENU) {
|
||||||
menu.addText("Changing system.xml to boot System Menu ...");
|
menu.addText("Changing system.xml to boot System Menu ...");
|
||||||
@ -243,7 +242,7 @@ void ApplicationState::update(Input *input) {
|
|||||||
// changeState(STATE_REMOVE_COLDBOOT);
|
// changeState(STATE_REMOVE_COLDBOOT);
|
||||||
setError(ERROR_INSTALLER_ERROR);
|
setError(ERROR_INSTALLER_ERROR);
|
||||||
} else {
|
} else {
|
||||||
changeState(STATE_REMOVE_AROMA);
|
changeState(STATE_REMOVE_PAYLOAD_LOADER);
|
||||||
}
|
}
|
||||||
} else if (this->state == STATE_REMOVE_COLDBOOT) {
|
} else if (this->state == STATE_REMOVE_COLDBOOT) {
|
||||||
auto result = InstallerService::setBootTitle(*this->systemMenuTitleId);
|
auto result = InstallerService::setBootTitle(*this->systemMenuTitleId);
|
||||||
@ -251,9 +250,9 @@ void ApplicationState::update(Input *input) {
|
|||||||
this->installerError = result;
|
this->installerError = result;
|
||||||
setError(ERROR_INSTALLER_ERROR);
|
setError(ERROR_INSTALLER_ERROR);
|
||||||
} else {
|
} else {
|
||||||
changeState(STATE_REMOVE_AROMA);
|
changeState(STATE_REMOVE_PAYLOAD_LOADER);
|
||||||
}
|
}
|
||||||
} else if (this->state == STATE_REMOVE_AROMA) {
|
} else if (this->state == STATE_REMOVE_PAYLOAD_LOADER) {
|
||||||
auto result = InstallerService::restoreAppFiles(this->appInfo->path);
|
auto result = InstallerService::restoreAppFiles(this->appInfo->path);
|
||||||
if (result != InstallerService::SUCCESS) {
|
if (result != InstallerService::SUCCESS) {
|
||||||
this->installerError = result;
|
this->installerError = result;
|
||||||
@ -270,7 +269,7 @@ void ApplicationState::update(Input *input) {
|
|||||||
} else {
|
} else {
|
||||||
changeState(STATE_BOOT_SWITCH_SUCCESS);
|
changeState(STATE_BOOT_SWITCH_SUCCESS);
|
||||||
}
|
}
|
||||||
} else if (this->state == STATE_BOOT_SWITCH_AROMA) {
|
} else if (this->state == STATE_BOOT_SWITCH_PAYLOAD_LOADER) {
|
||||||
OSEnableHomeButtonMenu(false);
|
OSEnableHomeButtonMenu(false);
|
||||||
auto result = InstallerService::setBootTitle(this->appInfo->titleId);
|
auto result = InstallerService::setBootTitle(this->appInfo->titleId);
|
||||||
if (result != InstallerService::SUCCESS) {
|
if (result != InstallerService::SUCCESS) {
|
||||||
@ -290,8 +289,8 @@ void ApplicationState::update(Input *input) {
|
|||||||
|
|
||||||
ApplicationState::ApplicationState() {
|
ApplicationState::ApplicationState() {
|
||||||
menu.setOptionsCallback([this](auto &&newState) { changeState(std::forward<decltype(newState)>(newState)); });
|
menu.setOptionsCallback([this](auto &&newState) { changeState(std::forward<decltype(newState)>(newState)); });
|
||||||
menu.setHeader("Aroma Installer");
|
|
||||||
menu.setFooter("By Maschell");
|
menu.setFooter("By Maschell");
|
||||||
|
menu.setHeader("PayloadLoader Installer");
|
||||||
|
|
||||||
changeState(STATE_WELCOME_SCREEN);
|
changeState(STATE_WELCOME_SCREEN);
|
||||||
DEBUG_FUNCTION_LINE("State has changed to \"STATE_WELCOME_SCREEN\"");
|
DEBUG_FUNCTION_LINE("State has changed to \"STATE_WELCOME_SCREEN\"");
|
||||||
|
@ -38,11 +38,11 @@ public:
|
|||||||
STATE_REMOVE_CONFIRM_DIALOG,
|
STATE_REMOVE_CONFIRM_DIALOG,
|
||||||
STATE_REMOVE_STARTED,
|
STATE_REMOVE_STARTED,
|
||||||
STATE_REMOVE_COLDBOOT,
|
STATE_REMOVE_COLDBOOT,
|
||||||
STATE_REMOVE_AROMA,
|
STATE_REMOVE_PAYLOAD_LOADER,
|
||||||
STATE_REMOVE_SUCCESS,
|
STATE_REMOVE_SUCCESS,
|
||||||
STATE_BOOT_MENU,
|
STATE_BOOT_MENU,
|
||||||
STATE_BOOT_SWITCH_SYSMENU,
|
STATE_BOOT_SWITCH_SYSMENU,
|
||||||
STATE_BOOT_SWITCH_AROMA,
|
STATE_BOOT_SWITCH_PAYLOAD_LOADER,
|
||||||
STATE_BOOT_SWITCH_SUCCESS,
|
STATE_BOOT_SWITCH_SUCCESS,
|
||||||
STATE_EXIT_SYSMENU,
|
STATE_EXIT_SYSMENU,
|
||||||
STATE_EXIT_SHUTDOWN,
|
STATE_EXIT_SHUTDOWN,
|
||||||
|
@ -66,7 +66,7 @@ int main_loop() {
|
|||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
WHBLogUdpInit();
|
WHBLogUdpInit();
|
||||||
DEBUG_FUNCTION_LINE("Hello from Aroma Installer!");
|
DEBUG_FUNCTION_LINE("Hello from PayloadLoader Installer!");
|
||||||
WHBProcInit();
|
WHBProcInit();
|
||||||
WiiUScreen::Init();
|
WiiUScreen::Init();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user