Skip to content

Commit 70ab3f0

Browse files
committed
Add R4 Ultra to flashcard list, and fix launched .nds file sometimes not starting
1 parent eea6d2d commit 70ab3f0

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

romsel_dsimenutheme/arm9/source/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ int flashcard;
102102
/* Flashcard value
103103
0: DSTT/R4i Gold/R4i-SDHC/R4 SDHC Dual-Core/R4 SDHC Upgrade/SC DSONE
104104
1: R4DS (Original Non-SDHC version)/ M3 Simply
105-
2: R4iDSN/R4i Gold RTS
105+
2: R4iDSN/R4i Gold RTS/R4 Ultra
106106
3: Acekard 2(i)/Galaxy Eagle/M3DS Real
107107
4: Acekard RPG
108108
5: Ace 3DS+/Gateway Blue Card/R4iTT

romsel_dsimenutheme/arm9/source/ndsLoaderArm9.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ int runNds (const void* loader, u32 loaderSize, u32 cluster, bool initDisc, bool
352352
}
353353

354354
int runNdsFile (const char* filename, int argc, const char** argv) {
355+
while(REG_VCOUNT != 191);
356+
355357
struct stat st;
356358
char filePath[PATH_MAX];
357359
int pathLen;

romsel_dsmenutheme/arm9/source/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int flashcard;
9696
/* Flashcard value
9797
0: DSTT/R4i Gold/R4i-SDHC/R4 SDHC Dual-Core/R4 SDHC Upgrade/SC DSONE
9898
1: R4DS (Original Non-SDHC version)/ M3 Simply
99-
2: R4iDSN/R4i Gold RTS
99+
2: R4iDSN/R4i Gold RTS/R4 Ultra
100100
3: Acekard 2(i)/Galaxy Eagle/M3DS Real
101101
4: Acekard RPG
102102
5: Ace 3DS+/Gateway Blue Card/R4iTT

romsel_dsmenutheme/arm9/source/ndsLoaderArm9.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ int runNds (const void* loader, u32 loaderSize, u32 cluster, bool initDisc, bool
352352
}
353353

354354
int runNdsFile (const char* filename, int argc, const char** argv) {
355+
while(REG_VCOUNT != 191);
356+
355357
struct stat st;
356358
char filePath[PATH_MAX];
357359
int pathLen;

titleandsettings/arm9/source/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ int flashcard;
7676
/* Flashcard value
7777
0: DSTT/R4i Gold/R4i-SDHC/R4 SDHC Dual-Core/R4 SDHC Upgrade/SC DSONE
7878
1: R4DS (Original Non-SDHC version)/ M3 Simply
79-
2: R4iDSN/R4i Gold RTS
79+
2: R4iDSN/R4i Gold RTS/R4 Ultra
8080
3: Acekard 2(i)/Galaxy Eagle/M3DS Real
8181
4: Acekard RPG
8282
5: Ace 3DS+/Gateway Blue Card/R4iTT
@@ -324,7 +324,7 @@ int main(int argc, char **argv) {
324324

325325
char vertext[12];
326326
// snprintf(vertext, sizeof(vertext), "Ver %d.%d.%d ", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); // Doesn't work :(
327-
snprintf(vertext, sizeof(vertext), "Ver %d.%d.%d ", 2, 0, 0);
327+
snprintf(vertext, sizeof(vertext), "Ver %d.%d.%d ", 2, 0, 1);
328328

329329
if (showlogo) {
330330
graphicsInit();
@@ -466,6 +466,7 @@ int main(int argc, char **argv) {
466466
case 2:
467467
printSmall(false, 12, 24, "R4iDSN");
468468
printSmall(false, 12, 32, "R4i Gold RTS");
469+
printSmall(false, 12, 40, "R4 Ultra");
469470
break;
470471
case 3:
471472
printSmall(false, 12, 24, "Acekard 2(i)");

0 commit comments

Comments
 (0)