Skip to content

Commit

Permalink
Change "Unset donor ROM" to "Enable/disable donor ROM"
Browse files Browse the repository at this point in the history
  • Loading branch information
RocketRobz committed May 31, 2017
1 parent fe8a577 commit bbe72bd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
Binary file modified 7zfile/_nds/bootstrap.nds
Binary file not shown.
1 change: 1 addition & 0 deletions 7zfile/_nds/nds-bootstrap.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
NDS_PATH = sd:/nds/ndsfile.nds
SAV_PATH = sd:/nds/savfile.nds
ARM7_DONOR_PATH =
USE_ARM7_DONOR = 1
BOOTSTRAP_PATH = sd:/_nds/bootstrap.nds
NTR_MODE_SWITCH = 0
BOOST_CPU = 0
Expand Down
20 changes: 11 additions & 9 deletions titleandsettings/arm9/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const char* bootstrapinipath = "sd:/_nds/nds-bootstrap.ini";
bool showlogo = true;
bool gotosettings = false;

std::string arm7DonorPath;
bool bstrap_useArm7Donor;

bool autorun = false;
int theme = 0;
Expand All @@ -71,7 +71,7 @@ void LoadSettings(void) {
// nds-bootstrap
CIniFile bootstrapini( bootstrapinipath );

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

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

printSmall(false, 12, 120, "Unset donor ROM");
printSmall(false, 12, 120, "Use donor ROM");
if(bstrap_useArm7Donor)
printSmall(false, 224, 120, "On");
else
printSmall(false, 224, 120, "Off");


if (settingscursor == 0) {
Expand Down Expand Up @@ -478,7 +482,7 @@ int main(int argc, char **argv) {
printSmall(false, 4, 164, "avoiding conflict with");
printSmall(false, 4, 172, "recent libnds.");
} else if (settingscursor == 7) {
printSmall(false, 4, 156, "Unset currently set");
printSmall(false, 4, 156, "Enable or disable use of");
printSmall(false, 4, 164, "donor ROM.");
}

Expand Down Expand Up @@ -546,10 +550,8 @@ int main(int argc, char **argv) {
menuprinted = false;
break;
case 7:
if (pressed & KEY_A) {
arm7DonorPath = "";
printSmall(false, 156, 120, "Done!");
}
bstrap_useArm7Donor = !bstrap_useArm7Donor;
menuprinted = false;
break;
}
}
Expand Down

0 comments on commit bbe72bd

Please sign in to comment.