Remove force_nand from the game file installer options

Nixeryun · Aug 2, 2020 · d4d8c9a · d4d8c9a
1 parent 7fb194c
commit d4d8c9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/arm9/source/godmode.c b/arm9/source/godmode.c
@@ -1574,7 +1574,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
                     continue;
                 }
                 DrawDirContents(current_dir, (*cursor = i), scroll);
-                if (InstallGameFile(path, to_emunand, false) == 0) n_success++;
+                if (InstallGameFile(path, to_emunand) == 0) n_success++;
                 else { // on failure: show error, continue
                     char lpathstr[32+1];
                     TruncateString(lpathstr, path, 32, 8);
@@ -1588,7 +1588,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
                     n_success, n_marked, n_other, n_marked);
             } else ShowPrompt(false, "%lu/%lu files installed ok", n_success, n_marked);
         } else {
-            u32 ret = InstallGameFile(file_path, to_emunand, false);
+            u32 ret = InstallGameFile(file_path, to_emunand);
             ShowPrompt(false, "%s\nInstall %s", pathstr, (ret == 0) ? "success" : "failed");
             if ((ret != 0) && (filetype & (GAME_NCCH|GAME_NCSD)) &&
                 ShowPrompt(true, "%s\nfile failed install.\n \nVerify now?", pathstr)) {

diff --git a/arm9/source/utils/gameutil.c b/arm9/source/utils/gameutil.c
@@ -2152,7 +2152,7 @@ u64 GetGameFileTitleId(const char* path) {
     return tid64;
 }
 
-u32 InstallGameFile(const char* path, bool to_emunand, bool force_nand) {
+u32 InstallGameFile(const char* path, bool to_emunand) {
     const char* drv;
     u64 filetype = IdentifyFileType(path);
     u32 ret = 0;
@@ -2164,7 +2164,7 @@ u32 InstallGameFile(const char* path, bool to_emunand, bool force_nand) {
     if (!tid64) return 1;
     if (((tid64 >> 32) & 0x8000) || (filetype & GAME_NDS))
         to_twl = true;
-    else if (!((tid64 >> 32) & 0x10) && !force_nand)
+    else if (!((tid64 >> 32) & 0x10))
         to_sd = true;
 
     // does the title.db exist?

diff --git a/arm9/source/utils/gameutil.h b/arm9/source/utils/gameutil.h
@@ -6,7 +6,7 @@ u32 VerifyGameFile(const char* path);
 u32 CheckEncryptedGameFile(const char* path);
 u32 CryptGameFile(const char* path, bool inplace, bool encrypt);
 u32 BuildCiaFromGameFile(const char* path, bool force_legit);
-u32 InstallGameFile(const char* path, bool to_emunand, bool force_nand);
+u32 InstallGameFile(const char* path, bool to_emunand);
 u32 DumpCxiSrlFromTmdFile(const char* path);
 u32 ExtractCodeFromCxiFile(const char* path, const char* path_out, char* extstr);
 u32 CompressCode(const char* path, const char* path_out);