diff --git a/arm9/source/driveMenu.cpp b/arm9/source/driveMenu.cpp index d0ea0d0..d7f212a 100644 --- a/arm9/source/driveMenu.cpp +++ b/arm9/source/driveMenu.cpp @@ -167,7 +167,31 @@ void driveMenu (void) { consoleClear(); ramDumped = true; }*/ + printf ("\x1B[47m"); // Print foreground white color + printf ("\x1b[23;0H"); + printf (titleName); + if (isDSiMode() && sdMountedDone) { + if (isRegularDS || sdMounted) { + printf ("\n"); + printf (sdMounted ? "R+B - Unmount SD card" : "R+B - Remount SD card"); + } + } else { + printf ("\n"); + printf (flashcardMounted ? "R+B - Unmount Flashcard" : "R+B - Remount Flashcard"); + } + printf ("\n"); + if (!isDSiMode() && isRegularDS) { + printf (POWERTEXT_DS); + } else if (is3DS) { + printf (POWERTEXT_3DS); + printf ("\n"); + printf (HOMETEXT); + } else { + printf (POWERTEXT); + } + printf ("\x1B[40m"); // Print foreground black color + printf ("\x1b[0;0H"); if (assignedOp[dmCursorPosition] == 0) { printf ("[sd:] SDCARD"); if (sdLabel[0] != '\0') { @@ -187,25 +211,6 @@ void driveMenu (void) { printf ("[nitro:] NDS GAME IMAGE\n"); printf ("(Game Virtual)"); } - printf ("\x1B[47m"); // Print foreground white color - if (isDSiMode() && sdMountedDone) { - if (isRegularDS || sdMounted) { - printf ("\x1b[21;0H"); - printf (titleName); - printf ("\x1b[22;0H"); - printf (sdMounted ? "R+B - Unmount SD card" : "R+B - Remount SD card"); - } else { - printf ("\x1b[22;0H"); - printf (titleName); - } - } else { - printf ("\x1b[21;0H"); - printf (titleName); - printf ("\x1b[22;0H"); - printf (flashcardMounted ? "R+B - Unmount Flashcard" : "R+B - Remount Flashcard"); - } - printf ("\x1b[23;0H"); - printf ((!isDSiMode() && isRegularDS) ? POWERTEXT_DS : POWERTEXT); consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 15, 0, true, true); diff --git a/arm9/source/file_browse.cpp b/arm9/source/file_browse.cpp index 81c0bec..7dc41fc 100644 --- a/arm9/source/file_browse.cpp +++ b/arm9/source/file_browse.cpp @@ -397,8 +397,30 @@ string browseForFile (void) { while (true) { consoleInit(NULL, 1, BgType_Text4bpp, BgSize_T_256x256, 15, 0, false, true); - printf ("\x1B[40m"); // Print foreground black color + + printf ("\x1B[47m"); // Print foreground white color + printf ("\x1b[23;0H"); + printf (titleName); + printf ("\n"); + printf ("X - DELETE file"); + printf ("\n"); + printf (clipboardOn ? "Y - PASTE file" : "Y - COPY file"); + printf ("\n"); + printf (clipboardOn ? "SELECT - Clear Clipboard" : "SELECT - Restore Clipboard"); + printf ("\n"); + if (!isDSiMode() && isRegularDS) { + printf (POWERTEXT_DS); + } else if (is3DS) { + printf (POWERTEXT_3DS); + printf ("\n"); + printf (HOMETEXT); + } else { + printf (POWERTEXT); + } + DirEntry* entry = &dirContents.at(fileOffset); + printf ("\x1B[40m"); // Print foreground black color + printf ("\x1b[0;0H"); printf (entry->name.c_str()); printf ("\n"); if (strcmp(entry->name.c_str(), "..") != 0) { @@ -415,17 +437,6 @@ string browseForFile (void) { printf ("\x1B[40m"); // Print foreground black color printf (clipboardFilename); } - printf ("\x1B[47m"); // Print foreground white color - printf ("\x1b[19;0H"); - printf (titleName); - printf ("\x1b[20;0H"); - printf ("X - DELETE file"); - printf ("\x1b[21;0H"); - printf (clipboardOn ? "Y - PASTE file" : "Y - COPY file"); - printf ("\x1b[22;0H"); - printf (clipboardOn ? "SELECT - Clear Clipboard" : "SELECT - Restore Clipboard"); - printf ("\x1b[23;0H"); - printf ((!isDSiMode() && isRegularDS) ? POWERTEXT_DS : POWERTEXT); consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 15, 0, true, true); showDirectoryContents (dirContents, fileOffset, screenOffset); diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp index 109fc92..4cd8d1a 100644 --- a/arm9/source/main.cpp +++ b/arm9/source/main.cpp @@ -77,7 +77,7 @@ int main(int argc, char **argv) { bool yHeld = false; - snprintf(titleName, sizeof(titleName), "GodMode9i v%i.%i.%i", 1, 3, 0); + snprintf(titleName, sizeof(titleName), "GodMode9i v%i.%i.%i", 1, 3, 1); // initialize video mode videoSetMode(MODE_4_2D); diff --git a/arm9/source/main.h b/arm9/source/main.h index 0c09503..8185543 100644 --- a/arm9/source/main.h +++ b/arm9/source/main.h @@ -3,6 +3,8 @@ #define POWERTEXT_DS "POWER - Poweroff" #define POWERTEXT "POWER - Reboot/[+held] Poweroff" +#define POWERTEXT_3DS "POWER - Sleep Mode screen" +#define HOMETEXT "HOME - HOME Menu prompt" extern char titleName[32];