Load .nds file for rebooting into RocketLauncher

Author: RocketRobz

7zfile/_nds/ResetIntoRocketLauncher.nds

@@ -29,7 +29,6 @@
 ---------------------------------------------------------------------------------*/
 #include <nds.h>
 
-#include "ResetData_Mario64.h"
 #include "RocketLauncher.h"	// RocketLauncher payload
 
 unsigned int * SCFG_ROM=(unsigned int*)0x4004000;
@@ -40,19 +39,16 @@ unsigned int * CPUID=(unsigned int*)0x4004D00;
 unsigned int * CPUID2=(unsigned int*)0x4004D04;
 
 //---------------------------------------------------------------------------------
-void RocketLauncherMode() {
+void LoadRocketLauncherPayload() {
 //---------------------------------------------------------------------------------
-	memcpy((u32*)0x02000000,ResetData_Mario64,0x560);
 	memcpy((u32*)0x02800000,payload_RocketLauncher,payload_RocketLauncher_len);
-	i2cWriteRegister(0x4A, 0x70, 0x01);		// Bootflag = Warmboot/SkipHealthSafety
-	i2cWriteRegister(0x4A, 0x11, 0x01);		// Soft-reset to Slot-1 card
 }
 
 //---------------------------------------------------------------------------------
 void VblankHandler(void) {
 //---------------------------------------------------------------------------------
 	if(fifoGetValue32(FIFO_USER_08) != 0) {
-		RocketLauncherMode();
+		LoadRocketLauncherPayload();
 	}
 }
 

titleandsettings/arm7/(raw) include/ResetData_Mario64

@@ -204,9 +204,10 @@ int main(int argc, char **argv) {
 
 	if (arm7SCFGLocked && !gotosettings && rebootInRocketLauncher && !(keysHeld() & KEY_L)) {
 		fifoSendValue32(FIFO_USER_08, 1);
-		for (int i = 0; i < 30; i++) {
+		for (int i = 0; i < 15; i++) {
 			swiWaitForVBlank();
 		}
+		runNdsFile ("sd:/_nds/ResetIntoRocketLauncher.nds", 0, 0);
 	}
 
 	if (!gotosettings && autorun && !(keysHeld() & KEY_B)) {
@@ -720,9 +721,10 @@ int main(int argc, char **argv) {
 								printSmall(false, 4, 4, "Saving settings...");
 								SaveSettings();
 								fifoSendValue32(FIFO_USER_08, 1);
-								for (int i = 0; i < 30; i++) {
+								for (int i = 0; i < 15; i++) {
 									swiWaitForVBlank();
 								}
+								runNdsFile ("sd:/_nds/ResetIntoRocketLauncher.nds", 0, 0);
 							}
 							menuprinted = false;
 							break;