Skip to content

Commit

Permalink
Add support for data titles
Browse files Browse the repository at this point in the history 
Still need to do ticket verification for sysmenuVersion to work. Settings can't boot otherwise.
  • Loading branch information
@rvtr
rvtr committed Jul 2, 2024
1 parent adad808 commit b5bcd71
Show file tree
Hide file tree
Showing 5 changed files with 182 additions and 89 deletions.
26 changes: 26 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,38 @@
*.d
*.nds
*.tad
*.wad
*.dsi
*.srl
*.elf
*.map
*build/
*.vscode
*.DS_Store
*._*

# For the emulator SD
*_nds/
*private/
*gm9i/

# Test TADs:
# 00030004
*BrainAgeExpressArtsAndLetters/
*BrainAgeExpressMath/
# 00030005
*DownloadPlay/
*PictoChat/
# 0003000f
*DSHashTable/
*sysmenuVersion/
*wlanfirm/
# 00030015
*Settings/
# 00030017
*Launcher/

# TWL EVA title check
*tad_check/

arm9/include/version.h
69 changes: 38 additions & 31 deletions arm9/src/install.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static bool _iqueHack(tDSiHeader* h)
{
if (!h) return false;

if (h->ndshdr.reserved1[8] == 0x80)
if (h->ndshdr.reserved1[8] == 0x80 && dataTitle == FALSE)
{
iprintf("iQue Hack...");

Expand All @@ -81,7 +81,7 @@ static unsigned long long _getSaveDataSize(tDSiHeader* h)
{
unsigned long long size = 0;

if (h)
if (h && dataTitle == FALSE)
{
size += h->public_sav_size;
size += h->private_sav_size;
Expand Down Expand Up @@ -154,7 +154,7 @@ static bool _openMenuSlot()

static void _createPublicSav(tDSiHeader* h, char* dataPath)
{
if (!h) return;
if (!h || dataTitle == TRUE) return;

if (h->public_sav_size > 0)
{
Expand Down Expand Up @@ -199,7 +199,7 @@ static void _createPublicSav(tDSiHeader* h, char* dataPath)

static void _createPrivateSav(tDSiHeader* h, char* dataPath)
{
if (!h) return;
if (!h || dataTitle == TRUE) return;

if (h->private_sav_size > 0)
{
Expand Down Expand Up @@ -244,7 +244,7 @@ static void _createPrivateSav(tDSiHeader* h, char* dataPath)

static void _createBannerSav(tDSiHeader* h, char* dataPath)
{
if (!h) return;
if (!h || dataTitle == TRUE) return;

if (h->appflags & 0x4)
{
Expand Down Expand Up @@ -391,7 +391,9 @@ bool install(char* tadPath, bool systemTitle)
h->tid_high == 0x0003000f || // Data titles
h->tid_high == 0x00030015 || // System titles
h->tid_high == 0x00030017) // Launcher
{}
{} else if (dataTitle == TRUE) {
iprintf("TAD is a data title. ");
}
else
{
iprintf("\x1B[31m"); //red
Expand Down Expand Up @@ -439,8 +441,13 @@ bool install(char* tadPath, bool systemTitle)
goto error;
}

//blacklisted titles
/*
// Blacklisted titles
//
// I'm disabling this because if you can reinstall wlanfirm then it's silly to block the camera app...
// The app has shown itself to be safe enough, and soon hopefully will get legit installs for some TADs.
{
//tid without region
u32 tidLow = (h->tid_low & 0xFFFFFF00);
if (!sdnandMode && (
Expand Down Expand Up @@ -474,19 +481,24 @@ bool install(char* tadPath, bool systemTitle)
}
}
}
*/

//confirmation message
{
const char system[] = "\x1B[41mWARNING:\x1B[47m This is a system app,\ninstalling it is potentially\nmore risky than regular DSiWare.\n\x1B[33m";
const char areYouSure[] = "Are you sure you want to install\n";
const char systemData[] = "\x1B[41mWARNING:\x1B[47m This is a data title,\ninstalling it is extremely\nrisky. You will have a very\n\x1B[31mhigh chance of bricking!\n\x1B[33m";
const char areYouSure[] = "Are you sure you want to install?\n";
clearScreen(&topScreen); // Top screen breaks after this for some reason.
printTadInfo(tadPath);
clearScreen(&bottomScreen);
char* msg = (char*)malloc(strlen(system) + strlen(areYouSure) + strlen(fpath) + 2);
if (sdnandMode || h->tid_high == 0x00030004)
sprintf(msg, "%s%s?\n", areYouSure, fpath);
else
sprintf(msg, "%s%s%s?\n", system, areYouSure, fpath);
if (sdnandMode || h->tid_high == 0x00030004) {
sprintf(msg, "%s\n", areYouSure);
} else if (dataTitle == TRUE) {
sprintf(msg, "%s%s\n", systemData, areYouSure);
} else {
sprintf(msg, "%s%s\n", system, areYouSure);
}

bool choice = choiceBox(msg);
free(msg);
Expand Down Expand Up @@ -518,7 +530,7 @@ bool install(char* tadPath, bool systemTitle)
}
else if(!sdnandMode && !unlaunchPatches && access(tmdPath, F_OK) != 0)
{
if (choicePrint("TMD not found, game cannot be\nplayed without Unlaunch's\nlauncher patches.\nSee wiki for how to get a TMD.\n\nInstall anyway?") == YES)
if (choicePrint("TMD not found, game cannot be\nplayed without Unlaunch's\nlauncher patches.\n\nInstall anyway?") == YES)
tmdFound = false;
else
goto error;
Expand Down Expand Up @@ -558,20 +570,10 @@ bool install(char* tadPath, bool systemTitle)
*/

//check that there's space on nand
/*
if (!_checkDsiSpace(installSize, (h->tid_high != 0x00030004)))
{
if (sdnandMode && choicePrint("Install as system title?"))
{
h->tid_high = 0x00030015;
fixHeader = true;
}
else
{
goto error;
}
goto error;
}
*/

//check for saves
char pubPath[PATH_MAX];
Expand Down Expand Up @@ -625,10 +627,15 @@ bool install(char* tadPath, bool systemTitle)
char dirPath[32];
mkdir(sdnandMode ? "sd:/title" : "nand:/title", 0777);

sprintf(dirPath, "%s:/title/%08x", sdnandMode ? "sd" : "nand", (unsigned int)h->tid_high);
mkdir(dirPath, 0777);

sprintf(dirPath, "%s:/title/%08x/%08x", sdnandMode ? "sd" : "nand", (unsigned int)h->tid_high, (unsigned int)h->tid_low);
if (dataTitle == TRUE) {
sprintf(dirPath, "%s:/title/%02x%02x%02x%02x", sdnandMode ? "sd" : "nand", srlTidHigh[0], srlTidHigh[1], srlTidHigh[2], srlTidHigh[3]);
mkdir(dirPath, 0777);
sprintf(dirPath, "%s:/title/%02x%02x%02x%02x/%02x%02x%02x%02x", sdnandMode ? "sd" : "nand", srlTidHigh[0], srlTidHigh[1], srlTidHigh[2], srlTidHigh[3], srlTidLow[0], srlTidLow[1], srlTidLow[2], srlTidLow[3]);
} else {
sprintf(dirPath, "%s:/title/%08x", sdnandMode ? "sd" : "nand", (unsigned int)h->tid_high);
mkdir(dirPath, 0777);
sprintf(dirPath, "%s:/title/%08x/%08x", sdnandMode ? "sd" : "nand", (unsigned int)h->tid_high, (unsigned int)h->tid_low);
}

//check if title is free
if (_titleIsUsed(h))
Expand Down Expand Up @@ -716,7 +723,7 @@ bool install(char* tadPath, bool systemTitle)

//pad out banner if it is the last part of the file
{
if (h->ndshdr.bannerOffset > (fileSize - 0x23C0))
if (h->ndshdr.bannerOffset > (fileSize - 0x23C0) && dataTitle == FALSE)
{
iprintf("Padding banner...");
swiWaitForVBlank();
Expand Down Expand Up @@ -831,7 +838,7 @@ bool install(char* tadPath, bool systemTitle)
}

//ticket folder /ticket/XXXXXXXX
if (tmdFound)
if (tmdFound && dataTitle == FALSE)
{
//ensure folders exist
char ticketPath[32];
Expand Down Expand Up @@ -870,7 +877,7 @@ bool install(char* tadPath, bool systemTitle)
remove("sd:/_nds/TADDeliveryTool/tmp/temp.tmd");
remove("sd:/_nds/TADDeliveryTool/tmp/temp.tik");
remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl.enc");
remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl");
//remove("sd:/_nds/TADDeliveryTool/tmp/temp.srl");
rmdir("sd:/_nds/TADDeliveryTool/tmp");

return result;
Expand Down
1 change: 1 addition & 0 deletions arm9/src/installmenu.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "main.h"
#include "rom.h"
#include "tad.h"
#include "install.h"
#include "menu.h"
#include "storage.h"
Expand Down
Loading

0 comments on commit b5bcd71

Please sign in to comment.