diff --git a/App Sources/Shortcut xbe's/Dashloader/shortcutxbe.c b/App Sources/Shortcut xbe's/Dashloader/shortcutxbe.c index 5b1b541..82575f0 100644 --- a/App Sources/Shortcut xbe's/Dashloader/shortcutxbe.c +++ b/App Sources/Shortcut xbe's/Dashloader/shortcutxbe.c @@ -44,148 +44,111 @@ void debuglog(const char* format, ...) } void ErrorHandler(char *xbepath) { - debuglog("\n------------------------------------------------"); - debuglog("Prep Dashboard"); - debuglog("------------------------------------------------"); - debuglog("Loading Prep Dashboard - E:\\Prep\\Default.xbe"); + debuglog("Checking: Prep dashboard\n"); + debuglog("\t> Loading Prep dashboard - E:\\Prep\\Default.xbe"); XLaunchXBE("E:\\Prep\\Default.xbe"); - debuglog("Dashboard doesn't Exist"); - /**/ - debuglog("\n------------------------------------------------"); - debuglog("Softmod Quick Update/Upgrade Dashboard"); - debuglog("------------------------------------------------"); - debuglog("Loading Quick Update Dashboard - E:\\Quick Update\\Default.xbe"); + debuglog("\t\t> Prep dashboard not found\n"); + + debuglog("Checking: Softmod Quick Update/Upgrade dashboard\n"); + debuglog("\t> E:\\Quick Update\\Default.xbe"); XLaunchXBE("E:\\Quick Update\\Default.xbe"); - debuglog("Loading Quick Upgrade Dashboard - E:\\Quick Upgrade\\Default.xbe"); + debuglog("\t> E:\\Quick Upgrade\\Default.xbe"); XLaunchXBE("E:\\Quick Upgrade\\Default.xbe"); - debuglog("Dashboards don't Exist"); - /**/ - debuglog("\n------------------------------------------------"); - debuglog("ShadowC Partition Integrity Check"); - debuglog("------------------------------------------------"); - debuglog("Checking ShadowC image integrity"); + debuglog("\t\t> Update/Upgrade dashboards not found\n"); + + debuglog("Checking ShadowC Partition Integrity\n"); + debuglog("\t> Checking ShadowC image integrity"); XLaunchXBE("C:\\nkpatcher\\rescuedash\\loader.xbe"); - debuglog("ShadowC image is loaded"); - /**/ - debuglog("\n------------------------------------------------"); - debuglog("Dashboard Locations"); - debuglog("------------------------------------------------"); - /**/ - debuglog("Loading C:\\XBMC-Emustation\\Default.xbe"); + debuglog("\t\t> ShadowC image is active, C partition is protected\n"); + + debuglog("Checking: Dashboard Locations\n"); + + debuglog("\t> Loading C:\\XBMC-Emustation\\Default.xbe"); XLaunchXBE("C:\\XBMC-Emustation\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC-Emustation\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC-Emustation\\Default.xbe"); XLaunchXBE("E:\\XBMC-Emustation\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC-Emustation\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC-Emustation\\Default.xbe"); XLaunchXBE("F:\\XBMC-Emustation\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC4Gamers\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC4Gamers\\Default.xbe"); XLaunchXBE("C:\\XBMC4Gamers\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC4Gamers\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC4Gamers\\Default.xbe"); XLaunchXBE("E:\\XBMC4Gamers\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC4Gamers\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC4Gamers\\Default.xbe"); XLaunchXBE("F:\\XBMC4Gamers\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC4Xbox\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC4Xbox\\Default.xbe"); XLaunchXBE("C:\\XBMC4Xbox\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC4Xbox\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC4Xbox\\Default.xbe"); XLaunchXBE("E:\\XBMC4Xbox\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC4Xbox\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC4Xbox\\Default.xbe"); XLaunchXBE("F:\\XBMC4Xbox\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC\\Default.xbe"); XLaunchXBE("C:\\XBMC\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC\\Default.xbe"); XLaunchXBE("E:\\XBMC\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC\\Default.xbe"); XLaunchXBE("F:\\XBMC\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\Dashboard\\Default.xbe"); - XLaunchXBE("C:\\Dashboard\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Dashboard\\Default.xbe"); - XLaunchXBE("E:\\Dashboard\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\Dashboard\\Default.xbe"); - XLaunchXBE("F:\\Dashboard\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\Dash\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\dashboard\\Default.xbe"); + XLaunchXBE("C:\\dashboard\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\dashboard\\Default.xbe"); + XLaunchXBE("E:\\dashboard\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\dashboard\\Default.xbe"); + XLaunchXBE("F:\\dashboard\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\Dash\\Default.xbe"); XLaunchXBE("C:\\Dash\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Dash\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\Dash\\Default.xbe"); XLaunchXBE("E:\\Dash\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\Dash\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\Dash\\Default.xbe"); XLaunchXBE("F:\\Dash\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\Default.xbe"); XLaunchXBE("E:\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Dashboard.xbe"); - XLaunchXBE("E:\\Dashboard.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\Evoxdash.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\dashboard.xbe"); + XLaunchXBE("E:\\dashboard.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\Evoxdash.xbe"); XLaunchXBE("C:\\Evoxdash.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Evoxdash.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\Evoxdash.xbe"); XLaunchXBE("E:\\Evoxdash.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC.xbe"); XLaunchXBE("C:\\XBMC.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC.xbe"); XLaunchXBE("E:\\XBMC.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("\n------------------------------------------------"); - debuglog("Rescue Dashboard Locations"); - debuglog("------------------------------------------------"); - /**/ - debuglog("Loading Rescue Dashboard TDATA"); + debuglog("\t\t> Dashboard not found\n"); + + + debuglog("Checking: Rescue dashboard locations\n"); + debuglog("\t> Loading Rescue dashboard TDATA"); XLaunchXBE("E:\\TDATA\\Rescuedash\\Default.xbe"); - debuglog("Rescue Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading Rescue Dashboard UDATA"); + + debuglog("\t\t> Rescue dashboard not found\n\n\t> Loading Rescue dashboard UDATA"); XLaunchXBE("E:\\UDATA\\Rescuedash\\Default.xbe"); - debuglog("RescueDashboard doesn't Exist\n"); - /**/ - debuglog("Loading Shadowc rescue Dashboard"); + + debuglog("\t\t> Rescue dashboard not found\n\n\t> Loading Shadowc rescue dashboard"); XLaunchXBE("R:\\NKPatcher\\rescuedash\\loader.xbe"); - debuglog("Rescue Dashboard doesn't Exist\n"); - /**/ - debuglog("\n------------------------------------------------"); - debuglog("All failed :( - trying to reboot"); - debuglog("------------------------------------------------"); + debuglog("\t\t> ShadowC rescue dashboard not found\n"); + + debuglog("\nAll failed :( - insert a disc and load from there"); XReboot(); } int LaunchShortcut(char* filename) @@ -294,9 +257,9 @@ int main(int argc,char* argv[]) { strcpy(shortcut, dashloader_Files_path"Custom_Dash.cfg"); } - debuglog("Dashloader Build 1.4"); + debuglog("Dashloader Build 1.4\n"); int timer = 0; - while(timer++ <= 2000) + while(timer++ <= 1000) { //----------------------------------------- // Handle input @@ -329,71 +292,66 @@ int main(int argc,char* argv[]) } if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] && (m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_START) ) { - debuglog("\n------------------------------------------------"); - debuglog("Rescue Dashboard Locations"); - debuglog("------------------------------------------------"); - debuglog("Loading Custom Rescue Dashboard\n"); + debuglog("Checking: Rescue dashboards\n"); + debuglog("\t> Loading Custom Rescue dashboard"); LaunchRecovery(dashloader_Files_path"Custom_Recovery.cfg"); - debuglog("Custom Rescue Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading Rescue Dashboard TDATA"); + + debuglog("\t\t> Custom Rescue dashboard not found\n\n\t> Loading Rescue dashboard TDATA"); XLaunchXBE("E:\\TDATA\\Rescuedash\\Default.xbe"); - debuglog("Rescue Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading Rescue Dashboard UDATA"); + + debuglog("\t\t> Rescue dashboard not found\n\n\t> Loading Rescue dashboard UDATA"); XLaunchXBE("E:\\UDATA\\Rescuedash\\Default.xbe"); - debuglog("RescueDashboard doesn't Exist\n"); - /**/ - debuglog("Loading Shadowc rescue Dashboard"); + + debuglog("\t\t> Rescue dashboard not found\n\n\t> Loading Shadowc rescue dashboard"); XLaunchXBE("R:\\NKPatcher\\rescuedash\\loader.xbe"); - debuglog("Rescue Dashboard doesn't Exist\n"); } - if( !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] || !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] && m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + break; + + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] && m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + break; + + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_A] ) { - if( !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] || !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) - { - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_A] ) - { - strcpy(shortcut, dashloader_Files_path"A_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_B] ) - { - strcpy(shortcut, dashloader_Files_path"B_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] ) - { - strcpy(shortcut, dashloader_Files_path"X_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) - { - strcpy(shortcut, dashloader_Files_path"Y_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_START ) - { - strcpy(shortcut, dashloader_Files_path"Start_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_BACK ) - { - strcpy(shortcut, dashloader_Files_path"Back_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_BLACK] ) - { - strcpy(shortcut, dashloader_Files_path"Black_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] ) - { - strcpy(shortcut, dashloader_Files_path"White_Button_Dash.cfg"); - break; - } - } + strcpy(shortcut, dashloader_Files_path"A_Button_Dash.cfg"); + break; } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_B] ) + { + strcpy(shortcut, dashloader_Files_path"B_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] ) + { + strcpy(shortcut, dashloader_Files_path"X_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + { + strcpy(shortcut, dashloader_Files_path"Y_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_START ) + { + strcpy(shortcut, dashloader_Files_path"Start_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_BACK ) + { + strcpy(shortcut, dashloader_Files_path"Back_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_BLACK] ) + { + strcpy(shortcut, dashloader_Files_path"Black_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] ) + { + strcpy(shortcut, dashloader_Files_path"White_Button_Dash.cfg"); + break; + } + Sleep(1); } LaunchShortcut(shortcut); diff --git a/App Sources/Shortcut xbe's/Dashloader/shortcutxbehm.c b/App Sources/Shortcut xbe's/Dashloader/shortcutxbehm.c index 400cce0..3a6ef41 100644 --- a/App Sources/Shortcut xbe's/Dashloader/shortcutxbehm.c +++ b/App Sources/Shortcut xbe's/Dashloader/shortcutxbehm.c @@ -45,105 +45,79 @@ void debuglog(const char* format, ...) } void ErrorHandler(char *xbepath) { - debuglog("\n------------------------------------------------"); - debuglog("Dashboard Locations"); - debuglog("------------------------------------------------"); - /**/ - debuglog("Loading C:\\XBMC-Emustation\\Default.xbe"); + debuglog("Checking: Dashboard Locations\n"); + + debuglog("\t> Loading C:\\XBMC-Emustation\\Default.xbe"); XLaunchXBE("C:\\XBMC-Emustation\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC-Emustation\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC-Emustation\\Default.xbe"); XLaunchXBE("E:\\XBMC-Emustation\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC-Emustation\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC-Emustation\\Default.xbe"); XLaunchXBE("F:\\XBMC-Emustation\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC4Gamers\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC4Gamers\\Default.xbe"); XLaunchXBE("C:\\XBMC4Gamers\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC4Gamers\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC4Gamers\\Default.xbe"); XLaunchXBE("E:\\XBMC4Gamers\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC4Gamers\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC4Gamers\\Default.xbe"); XLaunchXBE("F:\\XBMC4Gamers\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC4Xbox\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC4Xbox\\Default.xbe"); XLaunchXBE("C:\\XBMC4Xbox\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC4Xbox\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC4Xbox\\Default.xbe"); XLaunchXBE("E:\\XBMC4Xbox\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC4Xbox\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC4Xbox\\Default.xbe"); XLaunchXBE("F:\\XBMC4Xbox\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC\\Default.xbe"); XLaunchXBE("C:\\XBMC\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC\\Default.xbe"); XLaunchXBE("E:\\XBMC\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\XBMC\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\XBMC\\Default.xbe"); XLaunchXBE("F:\\XBMC\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\Dashboard\\Default.xbe"); - XLaunchXBE("C:\\Dashboard\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Dashboard\\Default.xbe"); - XLaunchXBE("E:\\Dashboard\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\Dashboard\\Default.xbe"); - XLaunchXBE("F:\\Dashboard\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\Dash\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\dashboard\\Default.xbe"); + XLaunchXBE("C:\\dashboard\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\dashboard\\Default.xbe"); + XLaunchXBE("E:\\dashboard\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\dashboard\\Default.xbe"); + XLaunchXBE("F:\\dashboard\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\Dash\\Default.xbe"); XLaunchXBE("C:\\Dash\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Dash\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\Dash\\Default.xbe"); XLaunchXBE("E:\\Dash\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading F:\\Dash\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading F:\\Dash\\Default.xbe"); XLaunchXBE("F:\\Dash\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Default.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\Default.xbe"); XLaunchXBE("E:\\Default.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Dashboard.xbe"); - XLaunchXBE("E:\\Dashboard.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\Evoxdash.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\dashboard.xbe"); + XLaunchXBE("E:\\dashboard.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\Evoxdash.xbe"); XLaunchXBE("E:\\Evoxdash.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading C:\\XBMC.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading C:\\XBMC.xbe"); XLaunchXBE("C:\\XBMC.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading E:\\XBMC.xbe"); + + debuglog("\t\t> Dashboard not found\n\n\t> Loading E:\\XBMC.xbe"); XLaunchXBE("E:\\XBMC.xbe"); - debuglog("Dashboard doesn't Exist\n"); - /**/ - debuglog("\n------------------------------------------------"); - debuglog("All failed :( - trying to reboot"); - debuglog("------------------------------------------------"); + debuglog("\t\t> Dashboard not found\n"); + + debuglog("\nAll failed :( - insert a disc and load from there"); XReboot(); } int LaunchShortcut(char* filename) @@ -280,9 +254,9 @@ int main(int argc,char* argv[]) { strcpy(shortcut, dashloader_Files_path"Custom_Dash.cfg"); } - debuglog("Dashloader Build 1.4"); + debuglog("Dashloader Build 1.4\n"); int timer = 0; - while(timer++ <= 2000) + while(timer++ <= 1000) { //----------------------------------------- // Handle input @@ -315,67 +289,63 @@ int main(int argc,char* argv[]) } if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] && (m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_START) ) { - debuglog("\n------------------------------------------------"); - debuglog("Rescue Dashboard Locations"); - debuglog("------------------------------------------------"); - debuglog("Loading Custom Rescue Dashboard\n"); + debuglog("Checking: Rescue dashboards\n"); + debuglog("\t> Loading Custom Rescue dashboard"); LaunchRecovery(dashloader_Files_path"Custom_Recovery.cfg"); - debuglog("Custom Rescue Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading Rescue Dashboard TDATA"); + + debuglog("\t\t> Custom Rescue dashboard not found\n\n\t> Loading Rescue dashboard TDATA"); XLaunchXBE("E:\\TDATA\\Rescuedash\\Default.xbe"); - debuglog("Rescue Dashboard doesn't Exist\n"); - /**/ - debuglog("Loading Rescue Dashboard UDATA"); + + debuglog("\t\t> Rescue dashboard not found\n\n\t> Loading Rescue dashboard UDATA"); XLaunchXBE("E:\\UDATA\\Rescuedash\\Default.xbe"); - debuglog("RescueDashboard doesn't Exist\n"); } - if( !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] || !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] && m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + break; + + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] && m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + break; + + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_A] ) { - if( !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] || !m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) - { - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_A] ) - { - strcpy(shortcut, dashloader_Files_path"A_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_B] ) - { - strcpy(shortcut, dashloader_Files_path"B_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] ) - { - strcpy(shortcut, dashloader_Files_path"X_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) - { - strcpy(shortcut, dashloader_Files_path"Y_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_START ) - { - strcpy(shortcut, dashloader_Files_path"Start_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_BACK ) - { - strcpy(shortcut, dashloader_Files_path"Back_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_BLACK] ) - { - strcpy(shortcut, dashloader_Files_path"Black_Button_Dash.cfg"); - break; - } - if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] ) - { - strcpy(shortcut, dashloader_Files_path"White_Button_Dash.cfg"); - break; - } - } + strcpy(shortcut, dashloader_Files_path"A_Button_Dash.cfg"); + break; } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_B] ) + { + strcpy(shortcut, dashloader_Files_path"B_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_X] ) + { + strcpy(shortcut, dashloader_Files_path"X_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_Y] ) + { + strcpy(shortcut, dashloader_Files_path"Y_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_START ) + { + strcpy(shortcut, dashloader_Files_path"Start_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.wPressedButtons & XINPUT_GAMEPAD_BACK ) + { + strcpy(shortcut, dashloader_Files_path"Back_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_BLACK] ) + { + strcpy(shortcut, dashloader_Files_path"Black_Button_Dash.cfg"); + break; + } + if( m_DefaultGamepad.bPressedAnalogButtons[XINPUT_GAMEPAD_WHITE] ) + { + strcpy(shortcut, dashloader_Files_path"White_Button_Dash.cfg"); + break; + } + Sleep(1); } LaunchShortcut(shortcut); diff --git a/Build Release.bat b/Build Release.bat index 8399d8d..9a67027 100644 --- a/Build Release.bat +++ b/Build Release.bat @@ -5,38 +5,37 @@ Set "root=%~dp0" if not exist "..\Other Stuff\dev.bin" Call :Download & Exit Set "Winrar=%CD%\Other\Tools\Winrar\winrar.exe" -If not exist "..\Release" ( - MD "..\Release\Extras Disc\Documents" - MD "..\Release\Extras Disc\Extras" - MD "..\Release\Installer Variants" - MD "..\Release\Utilites" - MD "..\Release\Documents" -) Call "Update Skin Version Number.bat" +For /f "tokens=2,* Delims==" %%a in ('findstr /b /i /l "Version" "%root%\Other\Build Version.txt"') do Set "version=%%a" +MD "Release\Build v%version%\Extras Disc\Documents" +MD "Release\Build v%version%\Extras Disc\Extras" +MD "Release\Build v%version%\Installer Variants" +MD "Release\Build v%version%\Utilites" +MD "Release\Build v%version%\Documents" Call "ReMove All Thumb.db.bat" Call "Build Softmod zip.bat" Call "Build Installer Variants.bat" Call "Build XISO.bat" :: Xbox Softmodding Tool -Move "Xbox Softmodding Tool.zip" "..\Release" -Copy "Changes.txt" "..\Release\" -Copy "Documents\ReadMe.url" "..\Release\Read Me.url" -Copy "Documents\Free FTP Programs.txt" "..\Release\Documents\" -Copy "Documents\How to run the exploit save.txt"" "..\Release\Documents\" -Copy "Documents\Troubleshooting.txt" "..\Release\Documents\" -Copy "Other\Graphics\thumb.jpg" "..\Release\" +Move "Xbox Softmodding Tool.zip" "Release\Build v%version%\" +Copy "Changes.txt" "Release\Build v%version%\" +Copy "Documents\ReadMe.url" "Release\Build v%version%\Read Me.url" +Copy "Documents\Free FTP Programs.txt" "Release\Build v%version%\Documents\" +Copy "Documents\How to run the exploit save.txt"" "Release\Build v%version%\Documents\" +Copy "Documents\Troubleshooting.txt" "Release\Build v%version%\Documents\" +Copy "Other\Graphics\thumb.jpg" "Release\Build v%version%\" :: Extras Disc -Move "*.iso" "..\Release\Extras Disc\" -Copy "Documents\UDDAE Instructions.txt" "..\Release\Extras Disc\Documents" -Copy "Documents\Run XISO from HDD.txt" "..\Release\Extras Disc\Documents" -Copy "Utilites\Xbox\Attacher, Detacher\Extras Disc Attacher.zip" "..\Release\Extras Disc\Extras" +Move "*.iso" "Release\Build v%version%\Extras Disc\" +Copy "Documents\UDDAE Instructions.txt" "Release\Build v%version%\Extras Disc\Documents" +Copy "Documents\Run XISO from HDD.txt" "Release\Build v%version%\Extras Disc\Documents" +Copy "Utilites\Xbox\Attacher, Detacher\Extras Disc Attacher.zip" "Release\Build v%version%\Extras Disc\Extras" :: Variants -Move "Quick Update.zip" "..\Release\Installer Variants" -Move "Quick Upgrade.zip" "..\Release\Installer Variants" -Move "XBHDM Build.zip" "..\Release\Installer Variants" +Move "Quick Update.zip" "Release\Build v%version%\Installer Variants" +Move "Quick Upgrade.zip" "Release\Build v%version%\Installer Variants" +Move "XBHDM Build.zip" "Release\Build v%version%\Installer Variants" :: Tools -Copy "Utilites\PC\zipped\*" "..\Release\Utilites" -Explorer "..\Release\" +Copy "Utilites\PC\zipped\*" "Release\Build v%version%\Utilites" +Explorer "Release\Build v%version%\" CD %root% :Download diff --git a/C Partition/nkpatcher/dashloader/default.xbe b/C Partition/nkpatcher/dashloader/default.xbe index efa2b7c..d6d79a2 100644 Binary files a/C Partition/nkpatcher/dashloader/default.xbe and b/C Partition/nkpatcher/dashloader/default.xbe differ diff --git a/Changes.txt b/Changes.txt index 71e2eda..334ceba 100644 --- a/Changes.txt +++ b/Changes.txt @@ -4,6 +4,11 @@ Created by Rocky5 ========================================= +========================================= + Update: Jun 20 2022 +========================================= + Updated dashloader logging and code to be cleaner and better. + ========================================= Update: Jan 14 2022 ========================================= diff --git a/Extras Disc/Hardmod/dashloader/evoxdash.xbe b/Extras Disc/Hardmod/dashloader/evoxdash.xbe index 327e672..b9e135e 100644 Binary files a/Extras Disc/Hardmod/dashloader/evoxdash.xbe and b/Extras Disc/Hardmod/dashloader/evoxdash.xbe differ diff --git a/Extras Disc/Softmod/softmod files/Xbox Softmodding Tool.zip b/Extras Disc/Softmod/softmod files/Xbox Softmodding Tool.zip index 01a035c..d787c52 100644 Binary files a/Extras Disc/Softmod/softmod files/Xbox Softmodding Tool.zip and b/Extras Disc/Softmod/softmod files/Xbox Softmodding Tool.zip differ