Skip to content

Commit 1278e64

Browse files
RocketRobzRocketRobz
committed
Replace AmEDS and CrocoDS with SugarDS
1 parent 111cffe commit 1278e64

File tree

14 files changed

+32
-239
lines changed

14 files changed

+32
-239
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ jobs:
146146
curl -LO https://github.com/wavemotion-dave/A7800DS/releases/latest/download/A7800DS.nds
147147
curl -LO https://github.com/wavemotion-dave/NINTV-DS/releases/latest/download/NINTV-DS.nds
148148
curl -LO https://github.com/wavemotion-dave/ColecoDS/releases/latest/download/ColecoDS.nds
149+
curl -LO https://github.com/wavemotion-dave/SugarDS/releases/latest/download/SugarDS.nds
149150
curl -LO https://bitbucket.org/Coto88/snemulds/raw/33f5f469b6e6c19cb3e1be9259b407832fce42b9/release/arm7dldi-ntr/SNEmulDS.nds
150151
curl -LO https://bitbucket.org/Coto88/snemulds/raw/33f5f469b6e6c19cb3e1be9259b407832fce42b9/release/arm7dldi-twl/SNEmulDS.srl
151152
curl -LO https://github.com/DS-Homebrew/NesDS/releases/latest/download/nesDS.nds

‎7zfile/Virtual Console/_nds/TWiLightMenu/emulators/AmEDS.nds‎

-849 KB
Binary file not shown.

‎7zfile/Virtual Console/_nds/TWiLightMenu/emulators/CrocoDS.nds‎

-515 KB
Binary file not shown.

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ You can help translate TWiLight Menu++ on the [Crowdin project](https://crowdin.
103103
- [asiekierka](https://github.com/asiekierka): Stargate 3DS autoboot file from [nds-miniboot](https://github.com/asiekierka/nds-miniboot)
104104
## App Launchers
105105
- [ahezard](https://github.com/ahezard), [shutterbug2000](https://github.com/shutterbug2000) and [Rocket Robz](https://github.com/RocketRobz): [nds-bootstrap](https://github.com/ahezard/nds-bootstrap) (used for launching Nintendo DS(i) ROMs off the SD card)
106-
- [Alekmaul](https://github.com/alekmaul): [AmeDS](https://www.gamebrew.org/wiki/AmeDS) (used for launching Amstrad CPC ROMs)
107106
- [Alekmaul](https://github.com/alekmaul) & [wavemotion](https://github.com/wavemotion-dave): [StellaDS](https://github.com/wavemotion-dave/StellaDS), [A5200DS](https://github.com/wavemotion-dave/A5200DS), [A7800DS](https://github.com/wavemotion-dave/A7800DS), [A8DS](https://github.com/wavemotion-dave/A8DS) (used for launching Atari 2600/5200/7800/XEGS ROMs), and [ColecoDS](https://github.com/wavemotion-dave/ColecoDS) (used for launching ColecoVision, MSX, Sord M5, and Sega SG-1000/SC-3000 ROMs)
108107
- archiede: [SNEmulDS](https://www.gamebrew.org/wiki/SNEmulDS) (used for launching SNES ROMs)
109108
- [Coto](https://coto88.bitbucket.io/): [SNEmulDS Revival](https://bitbucket.org/Coto88/snemulds)
@@ -117,9 +116,8 @@ You can help translate TWiLight Menu++ on the [Crowdin project](https://crowdin.
117116
- [unresolvedsymbol](https://github.com/unresolvedsymbol): [rom3M+master "DSL-Enhanced"](https://github.com/unresolvedsymbol/GBARunner2-DSL-Enhanced) builds of GBARunner2 included for playing *Pokémon: Emerald Version* on flashcards
118117
- Lordus: [jEnesisDS](https://gamebrew.org/wiki/JEnesisDS) (used for launching Sega Mega Drive/Genesis ROMs)
119118
- [xonn83](https://github.com/xonn83): GBMacro version of [jEnesisDS](https://github.com/xonn83/jEnesisDS_macro)
120-
- [redbug26](https://github.com/redbug26): [CrocoDS](https://github.com/redbug26/crocods-nds) (used for launching Amstrad CPC ROMs)
121119
- Ryan FB, [Rocket Robz](https://github.com/RocketRobz), and [xonn83](https://github.com/xonn83): [PicoDriveTWL](https://github.com/DS-Homebrew/PicoDriveTWL) (used for launching large Sega Mega Drive/Genesis ROMs)
122-
- [wavemotion](https://github.com/wavemotion-dave): [Nintellivision/NINTV-DS](https://github.com/wavemotion-dave/NINTV-DS) (used for launching Intellivision ROMs)
120+
- [wavemotion](https://github.com/wavemotion-dave): [Nintellivision/NINTV-DS](https://github.com/wavemotion-dave/NINTV-DS) (used for launching Intellivision ROMs) and [SugarDS](https://github.com/wavemotion-dave/SugarDS) (used for launching Amstrad CPC ROMs)
123121
## Graphics & Themes
124122
- [Absent-Reality](http://pixeljoint.com/p/19283.htm): Intellivision icon
125123
- davi: Border for GBC UI (originally for GameYob)

‎quickmenu/arm9/source/main.cpp‎

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3295,59 +3295,13 @@ int dsClassicMenu(void) {
32953295
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/NGPDS.nds";
32963296
boostVram = true;
32973297
}
3298-
} else if (extension(filename[ms().secondaryDevice], {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcAmEDS) {
3299-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? Launch::EAmEDSLaunch : Launch::ESDFlashcardLaunch);
3298+
} else if (extension(filename[ms().secondaryDevice], {".dsk"})) {
3299+
ms().launchType[ms().secondaryDevice] = Launch::ESugarDSLaunch;
33003300

3301-
if (ms().secondaryDevice) {
3302-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds";
3303-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
3304-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/AmEDS.nds";
3305-
boostVram = true;
3306-
}
3307-
} else {
3308-
useNDSB = true;
3309-
3310-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds";
3311-
ndsToBootFat = replaceAll(ndsToBoot, "sd:/", "fat:/");
3312-
CIniFile bootstrapini(BOOTSTRAP_INI);
3313-
3314-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
3315-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
3316-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
3317-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", ndsToBoot);
3318-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
3319-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
3320-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
3321-
3322-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
3323-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
3324-
}
3325-
} else if (extension(filename[ms().secondaryDevice], {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcCrocoDS) {
3326-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? Launch::ECrocoDSLaunch : Launch::ESDFlashcardLaunch);
3327-
3328-
if (ms().secondaryDevice) {
3329-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
3330-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
3331-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
3332-
boostVram = true;
3333-
}
3334-
} else {
3335-
useNDSB = true;
3336-
3337-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
3338-
ndsToBootFat = replaceAll(ndsToBoot, "sd:/", "fat:/");
3339-
CIniFile bootstrapini(BOOTSTRAP_INI);
3340-
3341-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
3342-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
3343-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
3344-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", ndsToBoot);
3345-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
3346-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
3347-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
3348-
3349-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
3350-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
3301+
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/SugarDS.nds";
3302+
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
3303+
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/SugarDS.nds";
3304+
boostVram = true;
33513305
}
33523306
} else if (extension(filename[ms().secondaryDevice], {".min"})) {
33533307
ms().launchType[ms().secondaryDevice] = Launch::EPokeMiniLaunch;

‎romsel_aktheme/arm9/source/main.cpp‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,57 +2381,13 @@ int akTheme(void) {
23812381
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/NGPDS.nds";
23822382
boostVram = true;
23832383
}
2384-
} else if (extension(filename, {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcAmEDS) {
2385-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? TWLSettings::EAmEDSLaunch : TWLSettings::ESDFlashcardLaunch);
2384+
} else if (extension(filename, {".dsk"})) {
2385+
ms().launchType[ms().secondaryDevice] = TWLSettings::ESugarDSLaunch;
23862386

2387-
if (ms().secondaryDevice) {
2388-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2389-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2390-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2391-
boostVram = true;
2392-
}
2393-
} else {
2394-
useNDSB = true;
2395-
2396-
ndsToBoot = (ms().bootstrapFile ? "sd:/_nds/nds-bootstrap-hb-nightly.nds" : "sd:/_nds/nds-bootstrap-hb-release.nds");
2397-
CIniFile bootstrapini(BOOTSTRAP_INI);
2398-
2399-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
2400-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
2401-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
2402-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds");
2403-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
2404-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
2405-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
2406-
2407-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
2408-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
2409-
}
2410-
} else if (extension(filename, {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcCrocoDS) {
2411-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? TWLSettings::ECrocoDSLaunch : TWLSettings::ESDFlashcardLaunch);
2412-
2413-
if (ms().secondaryDevice) {
2414-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2415-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2416-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2417-
boostVram = true;
2418-
}
2419-
} else {
2420-
useNDSB = true;
2421-
2422-
ndsToBoot = (ms().bootstrapFile ? "sd:/_nds/nds-bootstrap-hb-nightly.nds" : "sd:/_nds/nds-bootstrap-hb-release.nds");
2423-
CIniFile bootstrapini(BOOTSTRAP_INI);
2424-
2425-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
2426-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
2427-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
2428-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds");
2429-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
2430-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
2431-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
2432-
2433-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
2434-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
2387+
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/SugarDS.nds";
2388+
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2389+
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/SugarDS.nds";
2390+
boostVram = true;
24352391
}
24362392
} else if (extension(filename, {".min"})) {
24372393
ms().launchType[ms().secondaryDevice] = TWLSettings::EPokeMiniLaunch;

‎romsel_dsimenutheme/arm9/source/main.cpp‎

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2428,59 +2428,13 @@ int dsiMenuTheme(void) {
24282428
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/NGPDS.nds";
24292429
boostVram = true;
24302430
}
2431-
} else if (extension(filename, {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcAmEDS) {
2432-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? Launch::EAmEDSLaunch : Launch::ESDFlashcardLaunch);
2431+
} else if (extension(filename, {".dsk"})) {
2432+
ms().launchType[ms().secondaryDevice] = Launch::ESugarDSLaunch;
24332433

2434-
if (ms().secondaryDevice) {
2435-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2436-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2437-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2438-
boostVram = true;
2439-
}
2440-
} else {
2441-
useNDSB = true;
2442-
2443-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2444-
ndsToBootFat = replaceAll(ndsToBoot, "sd:/", "fat:/");
2445-
CIniFile bootstrapini(BOOTSTRAP_INI);
2446-
2447-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
2448-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
2449-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
2450-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", ndsToBoot);
2451-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
2452-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
2453-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
2454-
2455-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
2456-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
2457-
}
2458-
} else if (extension(filename, {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcCrocoDS) {
2459-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? Launch::ECrocoDSLaunch : Launch::ESDFlashcardLaunch);
2460-
2461-
if (ms().secondaryDevice) {
2462-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2463-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2464-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2465-
boostVram = true;
2466-
}
2467-
} else {
2468-
useNDSB = true;
2469-
2470-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2471-
ndsToBootFat = replaceAll(ndsToBoot, "sd:/", "fat:/");
2472-
CIniFile bootstrapini(BOOTSTRAP_INI);
2473-
2474-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
2475-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
2476-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
2477-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", ndsToBoot);
2478-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
2479-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
2480-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
2481-
2482-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
2483-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
2434+
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/SugarDS.nds";
2435+
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2436+
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/SugarDS.nds";
2437+
boostVram = true;
24842438
}
24852439
} else if (extension(filename, {".min"})) {
24862440
ms().launchType[ms().secondaryDevice] = Launch::EPokeMiniLaunch;

‎romsel_r4theme/arm9/source/main.cpp‎

Lines changed: 6 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,57 +2530,13 @@ int r4Theme(void) {
25302530
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/NGPDS.nds";
25312531
boostVram = true;
25322532
}
2533-
} else if (extension(filename, {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcAmEDS) {
2534-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? TWLSettings::EAmEDSLaunch : TWLSettings::ESDFlashcardLaunch);
2533+
} else if (extension(filename, {".dsk"})) {
2534+
ms().launchType[ms().secondaryDevice] = TWLSettings::ESugarDSLaunch;
25352535

2536-
if (ms().secondaryDevice) {
2537-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2538-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2539-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/AmEDS.nds";
2540-
boostVram = true;
2541-
}
2542-
} else {
2543-
useNDSB = true;
2544-
2545-
ndsToBoot = (ms().bootstrapFile ? "sd:/_nds/nds-bootstrap-hb-nightly.nds" : "sd:/_nds/nds-bootstrap-hb-release.nds");
2546-
CIniFile bootstrapini(BOOTSTRAP_INI);
2547-
2548-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
2549-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
2550-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
2551-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", "sd:/_nds/TWiLightMenu/emulators/AmEDS.nds");
2552-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
2553-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
2554-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
2555-
2556-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
2557-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
2558-
}
2559-
} else if (extension(filename, {".dsk"}) && ms().cpcEmulator == TWLSettings::ECpcCrocoDS) {
2560-
ms().launchType[ms().secondaryDevice] = (ms().secondaryDevice ? TWLSettings::ECrocoDSLaunch : TWLSettings::ESDFlashcardLaunch);
2561-
2562-
if (ms().secondaryDevice) {
2563-
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2564-
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2565-
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/CrocoDS.nds";
2566-
boostVram = true;
2567-
}
2568-
} else {
2569-
useNDSB = true;
2570-
2571-
ndsToBoot = (ms().bootstrapFile ? "sd:/_nds/nds-bootstrap-hb-nightly.nds" : "sd:/_nds/nds-bootstrap-hb-release.nds");
2572-
CIniFile bootstrapini(BOOTSTRAP_INI);
2573-
2574-
bootstrapini.SetString("NDS-BOOTSTRAP", "GUI_LANGUAGE", ms().getGuiLanguageString());
2575-
bootstrapini.SetInt("NDS-BOOTSTRAP", "LANGUAGE", ms().gameLanguage);
2576-
bootstrapini.SetInt("NDS-BOOTSTRAP", "DSI_MODE", 0);
2577-
bootstrapini.SetString("NDS-BOOTSTRAP", "NDS_PATH", "sd:/_nds/TWiLightMenu/emulators/CrocoDS.nds");
2578-
bootstrapini.SetString("NDS-BOOTSTRAP", "HOMEBREW_ARG", ROMpath);
2579-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_CPU", 1);
2580-
bootstrapini.SetInt("NDS-BOOTSTRAP", "BOOST_VRAM", 0);
2581-
2582-
bootstrapini.SetString("NDS-BOOTSTRAP", "RAM_DRIVE_PATH", "");
2583-
bootstrapini.SaveIniFile(BOOTSTRAP_INI);
2536+
ndsToBoot = "sd:/_nds/TWiLightMenu/emulators/SugarDS.nds";
2537+
if (!isDSiMode() || access(ndsToBoot, F_OK) != 0) {
2538+
ndsToBoot = "fat:/_nds/TWiLightMenu/emulators/SugarDS.nds";
2539+
boostVram = true;
25842540
}
25852541
} else if (extension(filename, {".min"})) {
25862542
ms().launchType[ms().secondaryDevice] = TWLSettings::EPokeMiniLaunch;

‎settings/arm9/source/language.inl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ STRING(COL_EMULATOR, "ColecoVision emulator")
142142
STRING(DSIWAREBOOTER, "DSiWare booter")
143143
STRING(GBA_BOOTER, "GBA booter")
144144
STRING(SG_EMULATOR, "Sega SG/SC emulator")
145-
STRING(CPC_EMULATOR, "Amstrad CPC emulator")
146145
STRING(SMS_EMULATOR, "Sega MS/GG emulator")
147146
STRING(MD_EMULATOR, "Sega MD/Gen emulator")
148147
STRING(RUNFLUBBAEMUSIN, "Run FluBBa emus. in")
@@ -158,7 +157,6 @@ STRING(DESCRIPTION_COL_EMULATOR, "Select which emulator to use for ColecoVision
158157
STRING(DESCRIPTION_DSIWAREBOOTER, "Select which app boots launched DSiWare apps or games.")
159158
STRING(DESCRIPTION_GBA_BOOTER, "Select how to run GBA ROMs.")
160159
STRING(DESCRIPTION_SG_EMULATOR, "Select which emulator to use for SG-1000 and SC-3000 ROMs.")
161-
STRING(DESCRIPTION_CPC_EMULATOR, "Select which emulator to use for Amstrad CPC ROMs.")
162160
STRING(DESCRIPTION_SMS_EMULATOR, "Select which emulator to use for Sega Master System and Game Gear ROMs.")
163161
STRING(DESCRIPTION_MD_EMULATOR, "Select which emulator to use for Sega Genesis/Mega Drive ROMs.")
164162
STRING(DESCRIPTION_RUNFLUBBAEMUSIN, "Run emulators developed by FluBBa in either DS or DSi mode. An older S8DS version will be used for SMS/GG ROMS. Set to DS mode if you can't run ROMs.")

‎settings/arm9/source/main.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,6 @@ int settingsMode(void)
14391439

14401440
using TGbaBooter = TWLSettings::TGbaBooter;
14411441
using TColSegaEmulator = TWLSettings::TColSegaEmulator;
1442-
using TCpcEmulator = TWLSettings::TCpcEmulator;
14431442
using TMegaDriveEmulator = TWLSettings::TMegaDriveEmulator;
14441443
using TSlot1LaunchMethod = TWLSettings::TSlot1LaunchMethod;
14451444

@@ -1460,7 +1459,6 @@ int settingsMode(void)
14601459
if (!(isDSiMode() && sdFound() && sys().arm7SCFGLocked()))
14611460
gamesPage.option(STR_MD_EMULATOR, STR_DESCRIPTION_MD_EMULATOR, Option::Int((int *)&ms().mdEmulator), {"jEnesisDS", "PicoDriveTWL", STR_HYBRID}, {TMegaDriveEmulator::EMegaDriveJenesis, TMegaDriveEmulator::EMegaDrivePico, TMegaDriveEmulator::EMegaDriveHybrid});
14621461
gamesPage.option(STR_SG_EMULATOR, STR_DESCRIPTION_SG_EMULATOR, Option::Int((int *)&ms().sgEmulator), {"S8DS", "ColecoDS"}, {TColSegaEmulator::EColSegaS8DS, TColSegaEmulator::EColSegaColecoDS});
1463-
gamesPage.option(STR_CPC_EMULATOR, STR_DESCRIPTION_CPC_EMULATOR, Option::Int((int *)&ms().cpcEmulator), {"AmEDS", "CrocoDS"}, {TCpcEmulator::ECpcAmEDS, TCpcEmulator::ECpcCrocoDS});
14641462
}
14651463

14661464
if (isDSiMode() && sdFound() && !sys().arm7SCFGLocked()) {

0 commit comments

Comments
 (0)