Now RocketLauncher enhanced!

DS-Homebrew · Jul 6, 2017 · 1819265 · 1819265
1 parent 4f73f66
commit 1819265
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 6 deletions.
diff --git a/7zfile/_nds/bootstrap.nds → 7zfile/_nds/dsiware-bootstrap.nds b/7zfile/_nds/bootstrap.nds → 7zfile/_nds/dsiware-bootstrap.nds
diff --git a/7zfile/_nds/nds-bootstrap.ini b/7zfile/_nds/nds-bootstrap.ini
@@ -5,7 +5,7 @@ ARM7_DONOR_PATH =
 USE_ARM7_DONOR = 1
 DONOR_SDK_VER = 0
 CHECK_COMPATIBILITY = 1;
-BOOTSTRAP_PATH = sd:/_nds/bootstrap.nds
+BOOTSTRAP_PATH = sd:/_nds/nds-bootstrap.nds
 ROMREAD_LED = 1
 BOOST_CPU = 0
 BOOST_VRAM = 0

diff --git a/7zfile/_nds/rocket-bootstrap.nds b/7zfile/_nds/rocket-bootstrap.nds
diff --git a/romsel_dsimenutheme/arm7/source/main.c b/romsel_dsimenutheme/arm7/source/main.c
@@ -30,6 +30,8 @@
 #include <nds.h>
 #include <maxmod7.h>
 
+unsigned int * SCFG_EXT=(unsigned int*)0x4004008;
+
 //---------------------------------------------------------------------------------
 void ReturntoDSiMenu() {
 //---------------------------------------------------------------------------------
@@ -94,6 +96,8 @@ int main() {
 
 	setPowerButtonCB(powerButtonCB);
 
+	fifoSendValue32(FIFO_USER_03, *SCFG_EXT);
+
 	// Keep the ARM7 mostly idle
 	while (!exitflag) {
 		if ( 0 == (REG_KEYINPUT & (KEY_SELECT | KEY_START | KEY_L | KEY_R))) {

diff --git a/romsel_dsimenutheme/arm9/source/main.cpp b/romsel_dsimenutheme/arm9/source/main.cpp
@@ -713,7 +713,11 @@ int main(int argc, char **argv) {
 					bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_REGION", mpuregion);
 					bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_SIZE", mpusize);
 					bootstrapini.SaveIniFile( "sd:/_nds/nds-bootstrap.ini" );
-					bootstrapfilename = bootstrapini.GetString("NDS-BOOTSTRAP", "BOOTSTRAP_PATH","");
+					if (fifoGetValue32(FIFO_USER_03) != 0) {
+						bootstrapfilename = "sd:/_nds/rocket-bootstrap.nds";
+					} else {
+						bootstrapfilename = "sd:/_nds/dsiware-bootstrap.nds";
+					}
 					int err = runNdsFile (bootstrapfilename.c_str(), 0, 0);
 					char text[32];
 					snprintf (text, sizeof(text), "Start failed. Error %i", err);

diff --git a/romsel_dsmenutheme/arm7/source/main.c b/romsel_dsmenutheme/arm7/source/main.c
@@ -30,6 +30,8 @@
 #include <nds.h>
 #include <maxmod7.h>
 
+unsigned int * SCFG_EXT=(unsigned int*)0x4004008;
+
 //---------------------------------------------------------------------------------
 void ReturntoDSiMenu() {
 //---------------------------------------------------------------------------------
@@ -94,6 +96,8 @@ int main() {
 
 	setPowerButtonCB(powerButtonCB);
 
+	fifoSendValue32(FIFO_USER_03, *SCFG_EXT);
+
 	// Keep the ARM7 mostly idle
 	while (!exitflag) {
 		if ( 0 == (REG_KEYINPUT & (KEY_SELECT | KEY_START | KEY_L | KEY_R))) {

diff --git a/romsel_dsmenutheme/arm9/source/main.cpp b/romsel_dsmenutheme/arm9/source/main.cpp
@@ -550,7 +550,11 @@ int main(int argc, char **argv) {
 					bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_REGION", mpuregion);
 					bootstrapini.SetInt( "NDS-BOOTSTRAP", "PATCH_MPU_SIZE", mpusize);
 					bootstrapini.SaveIniFile( "sd:/_nds/nds-bootstrap.ini" );
-					bootstrapfilename = bootstrapini.GetString("NDS-BOOTSTRAP", "BOOTSTRAP_PATH","");
+					if (fifoGetValue32(FIFO_USER_03) != 0) {
+						bootstrapfilename = "sd:/_nds/rocket-bootstrap.nds";
+					} else {
+						bootstrapfilename = "sd:/_nds/dsiware-bootstrap.nds";
+					}
 					int err = runNdsFile (bootstrapfilename.c_str(), 0, 0);
 					char text[32];
 					snprintf (text, sizeof(text), "Start failed. Error %i", err);

diff --git a/titleandsettings/arm9/source/main.cpp b/titleandsettings/arm9/source/main.cpp
@@ -200,14 +200,18 @@ int main(int argc, char **argv) {
 	scanKeys();
 
 	if (!gotosettings && autorun && !(keysHeld() & KEY_B)) {
-		CIniFile bootstrapini( bootstrapinipath );
-		bootstrapfilename = bootstrapini.GetString("NDS-BOOTSTRAP", "BOOTSTRAP_PATH","");
+		fifoWaitValue32(FIFO_USER_06);
+		if (fifoGetValue32(FIFO_USER_03) != 0) {
+			bootstrapfilename = "sd:/_nds/rocket-bootstrap.nds";
+		} else {
+			bootstrapfilename = "sd:/_nds/dsiware-bootstrap.nds";
+		}
 		runNdsFile (bootstrapfilename.c_str(), 0, 0);
 	}
 
 	char vertext[12];
 	// snprintf(vertext, sizeof(vertext), "Ver %d.%d.%d   ", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); // Doesn't work :(
-	snprintf(vertext, sizeof(vertext), "Ver %d.%d.%d   ", 1, 5, 1);
+	snprintf(vertext, sizeof(vertext), "Ver %d.%d.%d   ", 1, 6, 0);
 
 	if (showlogo) {
 		graphicsInit();