Skip to content

Commit bbe72bd

Browse files
committed
Change "Unset donor ROM" to "Enable/disable donor ROM"
1 parent fe8a577 commit bbe72bd

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

7zfile/_nds/bootstrap.nds

0 Bytes
Binary file not shown.

7zfile/_nds/nds-bootstrap.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
NDS_PATH = sd:/nds/ndsfile.nds
33
SAV_PATH = sd:/nds/savfile.nds
44
ARM7_DONOR_PATH =
5+
USE_ARM7_DONOR = 1
56
BOOTSTRAP_PATH = sd:/_nds/bootstrap.nds
67
NTR_MODE_SWITCH = 0
78
BOOST_CPU = 0

titleandsettings/arm9/source/main.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const char* bootstrapinipath = "sd:/_nds/nds-bootstrap.ini";
4545
bool showlogo = true;
4646
bool gotosettings = false;
4747

48-
std::string arm7DonorPath;
48+
bool bstrap_useArm7Donor;
4949

5050
bool autorun = false;
5151
int theme = 0;
@@ -71,7 +71,7 @@ void LoadSettings(void) {
7171
// nds-bootstrap
7272
CIniFile bootstrapini( bootstrapinipath );
7373

74-
arm7DonorPath = bootstrapini.GetString( "NDS-BOOTSTRAP", "ARM7_DONOR_PATH", "");
74+
bstrap_useArm7Donor = bootstrapini.GetInt( "NDS-BOOTSTRAP", "USE_ARM7_DONOR", 1);
7575
bstrap_boostcpu = bootstrapini.GetInt("NDS-BOOTSTRAP", "BOOST_CPU", 0);
7676
bstrap_boostvram = bootstrapini.GetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
7777
bstrap_debug = bootstrapini.GetInt("NDS-BOOTSTRAP", "DEBUG", 0);
@@ -94,7 +94,7 @@ void SaveSettings(void) {
9494
// nds-bootstrap
9595
CIniFile bootstrapini( bootstrapinipath );
9696

97-
bootstrapini.SetString( "NDS-BOOTSTRAP", "ARM7_DONOR_PATH", arm7DonorPath);
97+
bootstrapini.SetInt("NDS-BOOTSTRAP", "USE_ARM7_DONOR", bstrap_useArm7Donor);
9898
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", bstrap_boostcpu);
9999
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", bstrap_boostvram);
100100
bootstrapini.SetInt("NDS-BOOTSTRAP", "DEBUG", bstrap_debug);
@@ -449,7 +449,11 @@ int main(int argc, char **argv) {
449449
else
450450
printSmall(false, 224, 112, "Off");
451451

452-
printSmall(false, 12, 120, "Unset donor ROM");
452+
printSmall(false, 12, 120, "Use donor ROM");
453+
if(bstrap_useArm7Donor)
454+
printSmall(false, 224, 120, "On");
455+
else
456+
printSmall(false, 224, 120, "Off");
453457

454458

455459
if (settingscursor == 0) {
@@ -478,7 +482,7 @@ int main(int argc, char **argv) {
478482
printSmall(false, 4, 164, "avoiding conflict with");
479483
printSmall(false, 4, 172, "recent libnds.");
480484
} else if (settingscursor == 7) {
481-
printSmall(false, 4, 156, "Unset currently set");
485+
printSmall(false, 4, 156, "Enable or disable use of");
482486
printSmall(false, 4, 164, "donor ROM.");
483487
}
484488

@@ -546,10 +550,8 @@ int main(int argc, char **argv) {
546550
menuprinted = false;
547551
break;
548552
case 7:
549-
if (pressed & KEY_A) {
550-
arm7DonorPath = "";
551-
printSmall(false, 156, 120, "Done!");
552-
}
553+
bstrap_useArm7Donor = !bstrap_useArm7Donor;
554+
menuprinted = false;
553555
break;
554556
}
555557
}

0 commit comments

Comments
 (0)