The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-27 21:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

-added new default option for exit to which just boots the system menu

Browse Source 
without the priiloader magic word for system menu set to use priiloader 
default option
This commit is contained in:
fix94.1 2012-02-11 12:03:46 +00:00
parent 431c84f75c
commit 1caf757ef9
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/loader/sys.c
View File

@ -17,6 +17,7 @@ static bool reset = false;
static bool shutdown = false; static bool shutdown = false;
bool exiting = false; bool exiting = false;
static bool priiloader_def = false;
static bool return_to_hbc = false; static bool return_to_hbc = false;
static bool return_to_menu = false; static bool return_to_menu = false;
static bool return_to_priiloader = false; static bool return_to_priiloader = false;
@ -71,6 +72,7 @@ void Sys_Test(void)
void Sys_ExitTo(int option) void Sys_ExitTo(int option)
{ {
priiloader_def = option == PRIILOADER_DEF;
return_to_hbc = option == EXIT_TO_HBC; return_to_hbc = option == EXIT_TO_HBC;
return_to_menu = option == EXIT_TO_MENU; return_to_menu = option == EXIT_TO_MENU;
return_to_priiloader = option == EXIT_TO_PRIILOADER; return_to_priiloader = option == EXIT_TO_PRIILOADER;
@ -86,6 +88,10 @@ void Sys_ExitTo(int option)
{ {
Write32(0x8132fffb,0x4461636f); Write32(0x8132fffb,0x4461636f);
} }
else
{
Write32(0x8132fffb,0xffffffff);
}
} }
void Sys_Exit(void) void Sys_Exit(void)
@ -95,7 +101,7 @@ void Sys_Exit(void)
/* Shutdown Inputs */ /* Shutdown Inputs */
Close_Inputs(); Close_Inputs();
if (return_to_menu || return_to_priiloader) Sys_LoadMenu(); if (return_to_menu || return_to_priiloader || priiloader_def) Sys_LoadMenu();
else if(return_to_bootmii) IOS_ReloadIOS(254); else if(return_to_bootmii) IOS_ReloadIOS(254);
if(WII_LaunchTitle(HBC_108)<0) if(WII_LaunchTitle(HBC_108)<0)
if(WII_LaunchTitle(HBC_HAXX)<0) if(WII_LaunchTitle(HBC_HAXX)<0)

12
source/loader/sys.h
View File

@ -11,12 +11,12 @@ extern "C" {
#define HBC_JODI 0x0001000148415858ULL #define HBC_JODI 0x0001000148415858ULL
#define HBC_HAXX 0x000100014a4f4449ULL #define HBC_HAXX 0x000100014a4f4449ULL
#define EXIT_TO_MENU 0 #define PRIILOADER_DEF 0
#define EXIT_TO_HBC 1 #define EXIT_TO_MENU 1
#define EXIT_TO_PRIILOADER 2 #define EXIT_TO_HBC 2
#define EXIT_TO_DISABLE 3 #define EXIT_TO_PRIILOADER 3
#define EXIT_TO_BOOTMII 4 #define EXIT_TO_DISABLE 4
#define EXIT_TO_WIIFLOW 5 #define EXIT_TO_BOOTMII 5
/* Prototypes */ /* Prototypes */
void Sys_Init(void); void Sys_Init(void);

2
source/menu/menu.hpp
View File

@ -816,7 +816,7 @@ private:
static const SOption _AspectRatio[3]; static const SOption _AspectRatio[3];
static const SOption _vidModePatch[4]; static const SOption _vidModePatch[4];
static const SOption _hooktype[8]; static const SOption _hooktype[8];
static const SOption _exitTo[5]; static const SOption _exitTo[6];
static std::map<u8, u8> _installed_cios; static std::map<u8, u8> _installed_cios;
typedef std::map<u8, u8>::iterator CIOSItr; typedef std::map<u8, u8>::iterator CIOSItr;
static int _version[9]; static int _version[9];

7
source/menu/menu_config4.cpp
View File

@ -18,10 +18,11 @@ static inline int loopNum(int i, int s)
int currentChannelIndex = -1; int currentChannelIndex = -1;
int amountOfChannels = -1; int amountOfChannels = -1;
const CMenu::SOption CMenu::_exitTo[5] = { const CMenu::SOption CMenu::_exitTo[6] = {
{ "menu", L"Menu" }, { "def", L"Default" },
{ "menu", L"Sytem Menu" },
{ "hbc", L"HBC" }, { "hbc", L"HBC" },
{ "prii", L"Prii" }, { "prii", L"Priiloader" },
{ "disabled", L"Disabled" }, { "disabled", L"Disabled" },
{ "bootmii", L"BootMii" } { "bootmii", L"BootMii" }
}; };