From 4aa294b4447188805f635c9df83fbbac9871f182 Mon Sep 17 00:00:00 2001 From: Pk11 Date: Tue, 4 Jan 2022 22:27:09 -0600 Subject: [PATCH] Remove trying to remount flashcards (#140) as it doesn't work anyways --- arm9/source/driveMenu.cpp | 6 ++---- arm9/source/language.inl | 1 - nitrofiles/languages/en-US/language.ini | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arm9/source/driveMenu.cpp b/arm9/source/driveMenu.cpp index abc8a8a..6abd1bf 100644 --- a/arm9/source/driveMenu.cpp +++ b/arm9/source/driveMenu.cpp @@ -145,8 +145,8 @@ void dm_drawBottomScreen(void) { if ((isDSiMode() && memcmp(io_dldi_data->friendlyName, "Default", 7) == 0) || sdMountedDone) { font->print(0, row--, false, sdMounted ? STR_UNMOUNT_SDCARD : STR_REMOUNT_SDCARD); - } else { - font->print(0, row--, false, flashcardMounted ? STR_UNMOUNT_FLASHCARD : STR_REMOUNT_FLASHCARD); + } else if(flashcardMounted) { + font->print(0, row--, false, STR_UNMOUNT_FLASHCARD); } if ((sdMounted && driveWritable(Drive::sdCard)) || (flashcardMounted && driveWritable(Drive::flashcard))) { font->print(0, row--, false, STR_SCREENSHOTTEXT); @@ -403,8 +403,6 @@ void driveMenu (void) { currentDrive = Drive::flashcard; chdir("fat:/"); flashcardUnmount(); - } else { - flashcardMounted = flashcardMount(); } } } diff --git a/arm9/source/language.inl b/arm9/source/language.inl index 9197db7..37d399d 100644 --- a/arm9/source/language.inl +++ b/arm9/source/language.inl @@ -62,7 +62,6 @@ STRING(FAT_IMAGE, "(Image FAT, %s)") STRING(UNMOUNT_SDCARD, "\\R+\\B - Unmount SD card") STRING(REMOUNT_SDCARD, "\\R+\\B - Remount SD card") STRING(UNMOUNT_FLASHCARD, "\\R+\\B - Unmount Flashcard") -STRING(REMOUNT_FLASHCARD, "\\R+\\B - Remount Flashcard") STRING(START_START_MENU, "START - START menu") STRING(POWERTEXT_DS, "POWER - Poweroff") STRING(POWERTEXT, "POWER - Reboot/[+held] Poweroff") diff --git a/nitrofiles/languages/en-US/language.ini b/nitrofiles/languages/en-US/language.ini index 2144496..c7dbe20 100644 --- a/nitrofiles/languages/en-US/language.ini +++ b/nitrofiles/languages/en-US/language.ini @@ -59,7 +59,6 @@ FAT_IMAGE=(Image FAT, %s) UNMOUNT_SDCARD=\R+\B - Unmount SD card REMOUNT_SDCARD=\R+\B - Remount SD card UNMOUNT_FLASHCARD=\R+\B - Unmount Flashcard -REMOUNT_FLASHCARD=\R+\B - Remount Flashcard START_START_MENU=START - START menu POWERTEXT_DS=POWER - Poweroff POWERTEXT=POWER - Reboot/[+held] Poweroff