Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove force_nand from the game file installer options

Browse Source
This commit is contained in:
d0k3 2020-07-31 11:58:21 +02:00
parent 7fb194caea
commit d4d8c9a0ff
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/source/godmode.c
View File

@ -1574,7 +1574,7 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
continue; continue;
} }
DrawDirContents(current_dir, (*cursor = i), scroll); 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 else { // on failure: show error, continue
char lpathstr[32+1]; char lpathstr[32+1];
TruncateString(lpathstr, path, 32, 8); 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); n_success, n_marked, n_other, n_marked);
} else ShowPrompt(false, "%lu/%lu files installed ok", n_success, n_marked); } else ShowPrompt(false, "%lu/%lu files installed ok", n_success, n_marked);
} else { } 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"); ShowPrompt(false, "%s\nInstall %s", pathstr, (ret == 0) ? "success" : "failed");
if ((ret != 0) && (filetype & (GAME_NCCH|GAME_NCSD)) && if ((ret != 0) && (filetype & (GAME_NCCH|GAME_NCSD)) &&
ShowPrompt(true, "%s\nfile failed install.\n \nVerify now?", pathstr)) { ShowPrompt(true, "%s\nfile failed install.\n \nVerify now?", pathstr)) {

4
arm9/source/utils/gameutil.c
View File

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

2
arm9/source/utils/gameutil.h
View File

@ -6,7 +6,7 @@ u32 VerifyGameFile(const char* path);
u32 CheckEncryptedGameFile(const char* path); u32 CheckEncryptedGameFile(const char* path);
u32 CryptGameFile(const char* path, bool inplace, bool encrypt); u32 CryptGameFile(const char* path, bool inplace, bool encrypt);
u32 BuildCiaFromGameFile(const char* path, bool force_legit); 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 DumpCxiSrlFromTmdFile(const char* path);
u32 ExtractCodeFromCxiFile(const char* path, const char* path_out, char* extstr); u32 ExtractCodeFromCxiFile(const char* path, const char* path_out, char* extstr);
u32 CompressCode(const char* path, const char* path_out); u32 CompressCode(const char* path, const char* path_out);