mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-01 00:55:06 +01:00
-fixed exiting wiiflow lite in wiivc mode so it doesn't black screen the wii u and require it to be unplugged.
-in wiivc 'exit to' on home menu is now just 'exit'. to use the fix above. pressing home btn twice is also fixed. -fixed the code menu for entering the parental lock code with the wiiu gamepad or any non IR controller. -added access denied messages for startup settings and emunand settings if in wiivc. no need to mess with those in wiivc mode.
This commit is contained in:
parent
c13a061359
commit
1ceffc252c
BIN
out/boot.dol
BIN
out/boot.dol
Binary file not shown.
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
@ -101,28 +101,31 @@ void Sys_Exit(void)
|
|||||||
if(ExitOption == BUTTON_CALLBACK)
|
if(ExitOption == BUTTON_CALLBACK)
|
||||||
SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
|
SYS_ResetSystem(SYS_POWEROFF_STANDBY, 0, 0);
|
||||||
|
|
||||||
/* We wanna to boot something */
|
if(!isWiiVC)
|
||||||
WII_Initialize();
|
|
||||||
/* if in neek2o mode Launch_nk will just return to neek2o system menu and not launch anything */
|
|
||||||
if(ExitOption == EXIT_TO_WFNK2O)
|
|
||||||
Launch_nk(0x1000157464C41LL, NeekPath, 0);// 57464C41 = WFLA : 44574641 = DWFA
|
|
||||||
else if(ExitOption == EXIT_TO_SMNK2O)
|
|
||||||
Launch_nk(0, NeekPath, 0);
|
|
||||||
else if(ExitOption == EXIT_TO_BOOTMII)
|
|
||||||
IOS_ReloadIOS(0xfe);// IOS254 Bootmii IOS
|
|
||||||
else if(ExitOption == EXIT_TO_HBC)
|
|
||||||
{
|
{
|
||||||
WII_LaunchTitle(HBC_OHBC);
|
/* We wanna to boot something */
|
||||||
WII_LaunchTitle(HBC_LULZ);
|
WII_Initialize();
|
||||||
WII_LaunchTitle(HBC_108);
|
/* if in neek2o mode Launch_nk will just return to neek2o system menu and not launch anything */
|
||||||
WII_LaunchTitle(HBC_JODI);
|
if(ExitOption == EXIT_TO_WFNK2O)
|
||||||
WII_LaunchTitle(HBC_HAXX);
|
Launch_nk(0x1000157464C41LL, NeekPath, 0);// 57464C41 = WFLA : 44574641 = DWFA
|
||||||
|
else if(ExitOption == EXIT_TO_SMNK2O)
|
||||||
|
Launch_nk(0, NeekPath, 0);
|
||||||
|
else if(ExitOption == EXIT_TO_BOOTMII)
|
||||||
|
IOS_ReloadIOS(0xfe);// IOS254 Bootmii IOS
|
||||||
|
else if(ExitOption == EXIT_TO_HBC)
|
||||||
|
{
|
||||||
|
WII_LaunchTitle(HBC_OHBC);
|
||||||
|
WII_LaunchTitle(HBC_LULZ);
|
||||||
|
WII_LaunchTitle(HBC_108);
|
||||||
|
WII_LaunchTitle(HBC_JODI);
|
||||||
|
WII_LaunchTitle(HBC_HAXX);
|
||||||
|
}
|
||||||
|
else if(ExitOption == EXIT_TO_WIIU)
|
||||||
|
WII_LaunchTitle(WIIU_CHANNEL);
|
||||||
|
/* else Return to System Menu */
|
||||||
|
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
|
||||||
}
|
}
|
||||||
else if(ExitOption == EXIT_TO_WIIU)
|
exit(0);
|
||||||
WII_LaunchTitle(WIIU_CHANNEL);
|
|
||||||
/* else Return to System Menu */
|
|
||||||
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
|
|
||||||
exit(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __Sys_ResetCallback(void)
|
void __Sys_ResetCallback(void)
|
||||||
|
@ -78,6 +78,11 @@ void CMenu::_showBoot()
|
|||||||
|
|
||||||
bool CMenu::_Boot(void)
|
bool CMenu::_Boot(void)
|
||||||
{
|
{
|
||||||
|
if(isWiiVC)
|
||||||
|
{
|
||||||
|
error(_t("errboot7", L"Access denied in Wii VC mode."));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
set_port = currentPort;
|
set_port = currentPort;
|
||||||
bool prev_load = cur_load;
|
bool prev_load = cur_load;
|
||||||
u8 prev_ios = cur_ios;
|
u8 prev_ios = cur_ios;
|
||||||
|
@ -43,7 +43,7 @@ bool CMenu::_code(char code[4], bool erase)
|
|||||||
_mainLoopCommon();
|
_mainLoopCommon();
|
||||||
if(BTN_HOME_PRESSED)
|
if(BTN_HOME_PRESSED)
|
||||||
break;
|
break;
|
||||||
else if(WPadIR_ANY())
|
else if(ShowPointer())//wpad ir any or controller left stick to show pointer
|
||||||
{
|
{
|
||||||
if(BTN_B_PRESSED)
|
if(BTN_B_PRESSED)
|
||||||
break;
|
break;
|
||||||
|
@ -135,6 +135,11 @@ bool CMenu::_Home(void)
|
|||||||
else if(m_btnMgr.selected(m_homeBtnExitTo))
|
else if(m_btnMgr.selected(m_homeBtnExitTo))
|
||||||
{
|
{
|
||||||
_hideHome();
|
_hideHome();
|
||||||
|
if(isWiiVC)
|
||||||
|
{
|
||||||
|
exitHandler(EXIT_TO_MENU);
|
||||||
|
break;
|
||||||
|
}
|
||||||
if(m_locked)
|
if(m_locked)
|
||||||
exitHandler(WIIFLOW_DEF);
|
exitHandler(WIIFLOW_DEF);
|
||||||
else
|
else
|
||||||
@ -158,7 +163,12 @@ bool CMenu::_Home(void)
|
|||||||
}
|
}
|
||||||
else if(BTN_HOME_PRESSED)
|
else if(BTN_HOME_PRESSED)
|
||||||
{
|
{
|
||||||
exitHandler(WIIFLOW_DEF);
|
if(isWiiVC)
|
||||||
|
{
|
||||||
|
exitHandler(EXIT_TO_MENU);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
exitHandler(WIIFLOW_DEF);// WIIFLOW_DEF is what is set in main config as the exit to option
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if(BTN_B_PRESSED)
|
else if(BTN_B_PRESSED)
|
||||||
@ -390,7 +400,11 @@ void CMenu::_textHome(void)
|
|||||||
|
|
||||||
m_btnMgr.setText(m_homeBtnInstall, _t("home7", L"Install Game"));
|
m_btnMgr.setText(m_homeBtnInstall, _t("home7", L"Install Game"));
|
||||||
m_btnMgr.setText(m_homeBtnAbout, _t("home4", L"Credits"));
|
m_btnMgr.setText(m_homeBtnAbout, _t("home4", L"Credits"));
|
||||||
m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
|
if(isWiiVC)
|
||||||
|
m_btnMgr.setText(m_homeBtnExitTo, _t("home12", L"Exit"));
|
||||||
|
else
|
||||||
|
m_btnMgr.setText(m_homeBtnExitTo, _t("home5", L"Exit To"));
|
||||||
|
|
||||||
m_btnMgr.setText(m_homeBtnSelPlugin, _t("cfgpl1", L"Select Plugins"));
|
m_btnMgr.setText(m_homeBtnSelPlugin, _t("cfgpl1", L"Select Plugins"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -528,6 +528,11 @@ void CMenu::_showNandEmu(void)
|
|||||||
|
|
||||||
int CMenu::_NandEmuCfg(void)
|
int CMenu::_NandEmuCfg(void)
|
||||||
{
|
{
|
||||||
|
if(isWiiVC)
|
||||||
|
{
|
||||||
|
error(_t("errboot7", L"Access denied in Wii VC mode."));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
nandemuPage = 1;
|
nandemuPage = 1;
|
||||||
string ExtNand = "";
|
string ExtNand = "";
|
||||||
string emuNand = m_cfg.getString(CHANNEL_DOMAIN, "current_emunand");
|
string emuNand = m_cfg.getString(CHANNEL_DOMAIN, "current_emunand");
|
||||||
|
@ -253,6 +253,11 @@ void * CMenu::_GCcopyGame(void *obj)
|
|||||||
|
|
||||||
bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
|
bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
|
||||||
{
|
{
|
||||||
|
if(op == WO_ADD_GAME)
|
||||||
|
{
|
||||||
|
error(_t("wbfsoperr6", L"Install game is broken,\nplease use cleanrip."));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
lwp_t thread = 0;
|
lwp_t thread = 0;
|
||||||
char GameID[7];
|
char GameID[7];
|
||||||
GameID[6] = '\0';
|
GameID[6] = '\0';
|
||||||
@ -323,9 +328,9 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
|
|||||||
}
|
}
|
||||||
if (Disc_IsWii() == 0)
|
if (Disc_IsWii() == 0)
|
||||||
{
|
{
|
||||||
error(_t("wbfsoperr6", L"Install game is broken, please use cleanrip."));
|
//error(_t("wbfsoperr6", L"Install game is broken, please use cleanrip."));
|
||||||
out = true;
|
//out = true;
|
||||||
break;
|
//break;
|
||||||
|
|
||||||
Disc_ReadHeader(&wii_hdr);
|
Disc_ReadHeader(&wii_hdr);
|
||||||
memcpy(GameID, wii_hdr.id, 6);
|
memcpy(GameID, wii_hdr.id, 6);
|
||||||
@ -349,9 +354,9 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
|
|||||||
}
|
}
|
||||||
else if(Disc_IsGC() == 0)
|
else if(Disc_IsGC() == 0)
|
||||||
{
|
{
|
||||||
error(_t("wbfsoperr6", L"Install game is broken, please use cleanrip."));
|
//error(_t("wbfsoperr6", L"Install game is broken, please use cleanrip."));
|
||||||
out = true;
|
//out = true;
|
||||||
break;
|
//break;
|
||||||
|
|
||||||
Disc_ReadGCHeader(&gc_hdr);
|
Disc_ReadGCHeader(&gc_hdr);
|
||||||
memcpy(GameID, gc_hdr.id, 6);
|
memcpy(GameID, gc_hdr.id, 6);
|
||||||
|
@ -276,6 +276,7 @@ errboot3=Could not initialize the DIP module!
|
|||||||
errboot4=No apps/wiiflow directory found!
|
errboot4=No apps/wiiflow directory found!
|
||||||
errboot5=data_on_usb=yes and no available usb partitions for data!\nUsing SD.
|
errboot5=data_on_usb=yes and no available usb partitions for data!\nUsing SD.
|
||||||
errboot6=No available usb partitions for data and no SD inserted!\nExiting.
|
errboot6=No available usb partitions for data and no SD inserted!\nExiting.
|
||||||
|
errboot7=Access denied in Wii VC mode.
|
||||||
errgame1=Cannot find the game with ID: %s
|
errgame1=Cannot find the game with ID: %s
|
||||||
errgame2=No cIOS found!
|
errgame2=No cIOS found!
|
||||||
errgame4=Couldn't load IOS %i
|
errgame4=Couldn't load IOS %i
|
||||||
@ -326,6 +327,7 @@ home8=File Explorer
|
|||||||
home9=Source Menu
|
home9=Source Menu
|
||||||
home10=FTP Server
|
home10=FTP Server
|
||||||
home11=Cache Covers
|
home11=Cache Covers
|
||||||
|
home12=Exit
|
||||||
hooktype1=VBI
|
hooktype1=VBI
|
||||||
hooktype2=KPAD Read
|
hooktype2=KPAD Read
|
||||||
hooktype3=Joypad
|
hooktype3=Joypad
|
||||||
@ -452,7 +454,7 @@ wbfsoperr2=Disc_Open failed
|
|||||||
wbfsoperr3=This is not a Wii disc!
|
wbfsoperr3=This is not a Wii disc!
|
||||||
wbfsoperr4=Game already installed
|
wbfsoperr4=Game already installed
|
||||||
wbfsoperr5=Deleting this Channel is not allowed!
|
wbfsoperr5=Deleting this Channel is not allowed!
|
||||||
wbfsoperr6=Install game is broken, please use cleanrip.
|
wbfsoperr6=Install game is broken,\nplease use cleanrip.
|
||||||
wbfsprogress=%i%%
|
wbfsprogress=%i%%
|
||||||
wbfsremdlg=To permanently remove the game : %s, click on Go.
|
wbfsremdlg=To permanently remove the game : %s, click on Go.
|
||||||
wifiplayers= Wifi Players
|
wifiplayers= Wifi Players
|
||||||
|
Loading…
Reference in New Issue
Block a user