diff --git a/retail/arm9/include/configuration.h b/retail/arm9/include/configuration.h index a1ca02a2a..267cadb48 100644 --- a/retail/arm9/include/configuration.h +++ b/retail/arm9/include/configuration.h @@ -22,16 +22,16 @@ typedef struct configuration { char* donorTwlPath; char* donorTwlOnly0Path; char* donorTwlOnlyPath; - //char* cleanDonorPath; - char* gbaPath; - char* gbaSavPath; + // char* cleanDonorPath; + // char* gbaPath; + // char* gbaSavPath; char* apPatchPath; u32 donorFileSize; u32 donorFileOffset; u32 romSize; u32 saveSize; - u32 gbaRomSize; - u32 gbaSaveSize; + // u32 gbaRomSize; + // u32 gbaSaveSize; u32 wideCheatSize; u32 apPatchSize; u32 cheatSize; @@ -52,7 +52,7 @@ typedef struct configuration { u8 patchMpuRegion; u32 patchMpuSize; u8 consoleModel; - //int colorMode; + // int colorMode; u8 romRead_LED; u8 dmaRomRead_LED; bool asyncCardRead; diff --git a/retail/arm9/include/nds_loader_arm9.h b/retail/arm9/include/nds_loader_arm9.h index d828555ea..08908ce73 100644 --- a/retail/arm9/include/nds_loader_arm9.h +++ b/retail/arm9/include/nds_loader_arm9.h @@ -31,7 +31,7 @@ extern "C" //#define LOAD_DEFAULT_NDS 0 -int runNds(u32 cluster, u32 saveCluster, u32 donorTwlCluster, u32 gbaCluster, u32 gbaSavCluster, u32 wideCheatCluster, u32 apPatchCluster, u32 cheatCluster, u32 patchOffsetCacheCluster, u32 ramDumpCluster, u32 srParamsCluster, u32 screenshotCluster, u32 apFixOverlaysCluster, u32 musicCluster, u32 pageFileCluster, u32 manualCluster, u32 sharedFontCluster, configuration* conf); +int runNds(u32 cluster, u32 saveCluster, u32 donorTwlCluster, /* u32 gbaCluster, u32 gbaSavCluster, */ u32 wideCheatCluster, u32 apPatchCluster, u32 cheatCluster, u32 patchOffsetCacheCluster, u32 ramDumpCluster, u32 srParamsCluster, u32 screenshotCluster, u32 apFixOverlaysCluster, u32 musicCluster, u32 pageFileCluster, u32 manualCluster, u32 sharedFontCluster, configuration* conf); #ifdef __cplusplus } diff --git a/retail/arm9/source/conf_sd.cpp b/retail/arm9/source/conf_sd.cpp index 42795df1c..66db94f15 100644 --- a/retail/arm9/source/conf_sd.cpp +++ b/retail/arm9/source/conf_sd.cpp @@ -158,10 +158,10 @@ static void load_conf(configuration* conf, const char* fn) { conf->donorTwlOnlyPath = strdup(config_file.fetch("NDS-BOOTSTRAP", "DONORTWLONLY_NDS_PATH").c_str()); // GBA path - conf->gbaPath = strdup(config_file.fetch("NDS-BOOTSTRAP", "GBA_PATH").c_str()); + // conf->gbaPath = strdup(config_file.fetch("NDS-BOOTSTRAP", "GBA_PATH").c_str()); // GBA SAV path - conf->gbaSavPath = strdup(config_file.fetch("NDS-BOOTSTRAP", "GBA_SAV_PATH").c_str()); + // conf->gbaSavPath = strdup(config_file.fetch("NDS-BOOTSTRAP", "GBA_SAV_PATH").c_str()); // AP-patch path conf->apPatchPath = strdup(config_file.fetch("NDS-BOOTSTRAP", "AP_FIX_PATH").c_str()); @@ -1574,8 +1574,8 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) { } conf->saveSize = getFileSize(conf->savPath); - conf->gbaRomSize = getFileSize(conf->gbaPath); - conf->gbaSaveSize = getFileSize(conf->gbaSavPath); + // conf->gbaRomSize = getFileSize(conf->gbaPath); + // conf->gbaSaveSize = getFileSize(conf->gbaSavPath); conf->wideCheatSize = getFileSize(wideCheatFilePath.c_str()); conf->apPatchSize = getFileSize(conf->apPatchPath); conf->cheatSize = getFileSize(cheatFilePath.c_str()); diff --git a/retail/arm9/source/main.cpp b/retail/arm9/source/main.cpp index 7c7f2b64a..3710a1a23 100644 --- a/retail/arm9/source/main.cpp +++ b/retail/arm9/source/main.cpp @@ -405,8 +405,8 @@ static int runNdsFile(configuration* conf) { struct stat stDonor0; struct stat stDonor5; struct stat stDonor5Alt; - struct stat stGba; - struct stat stGbaSav; + // struct stat stGba; + // struct stat stGbaSav; struct stat stWideCheat; struct stat stApPatch; struct stat stCheat; @@ -421,8 +421,8 @@ static int runNdsFile(configuration* conf) { struct stat stTwlFont; u32 clusterSav = 0; u32 clusterDonor = 0; - u32 clusterGba = 0; - u32 clusterGbaSav = 0; + // u32 clusterGba = 0; + // u32 clusterGbaSav = 0; u32 clusterWideCheat = 0; u32 clusterApPatch = 0; u32 clusterCheat = 0; @@ -491,13 +491,13 @@ static int runNdsFile(configuration* conf) { } if (dsiFeatures() && !conf->b4dsMode) { - if (stat(conf->gbaPath, &stGba) >= 0) { + /* if (stat(conf->gbaPath, &stGba) >= 0) { clusterGba = stGba.st_ino; } if (stat(conf->gbaSavPath, &stGbaSav) >= 0) { clusterGbaSav = stGbaSav.st_ino; - } + } */ if (stat(wideCheatFilePath.c_str(), &stWideCheat) >= 0) { clusterWideCheat = stWideCheat.st_ino; @@ -532,7 +532,7 @@ static int runNdsFile(configuration* conf) { clusterTwlFont = stTwlFont.st_ino; } - return runNds(st.st_ino, clusterSav, clusterDonor, clusterGba, clusterGbaSav, clusterWideCheat, clusterApPatch, clusterCheat, clusterPatchOffsetCache, clusterRamDump, clusterSrParams, clusterScreenshot, apFixOverlaysCluster, musicCluster, clusterPageFile, clusterManual, clusterTwlFont, conf); + return runNds(st.st_ino, clusterSav, clusterDonor, /* clusterGba, clusterGbaSav, */ clusterWideCheat, clusterApPatch, clusterCheat, clusterPatchOffsetCache, clusterRamDump, clusterSrParams, clusterScreenshot, apFixOverlaysCluster, musicCluster, clusterPageFile, clusterManual, clusterTwlFont, conf); } int main(int argc, char** argv) { diff --git a/retail/arm9/source/nds_loader_arm9.c b/retail/arm9/source/nds_loader_arm9.c index 1cd49c6af..1405d2ba9 100644 --- a/retail/arm9/source/nds_loader_arm9.c +++ b/retail/arm9/source/nds_loader_arm9.c @@ -234,7 +234,7 @@ static bool dldiPatchLoader (data_t *binData, u32 binSize, bool clearBSS) return true; } -int runNds(u32 cluster, u32 saveCluster, u32 donorTwlCluster, u32 gbaCluster, u32 gbaSavCluster, u32 wideCheatCluster, u32 apPatchCluster, u32 cheatCluster, u32 patchOffsetCacheCluster, u32 ramDumpCluster, u32 srParamsCluster, u32 screenshotCluster, u32 apFixOverlaysCluster, u32 musicCluster, u32 pageFileCluster, u32 manualCluster, u32 sharedFontCluster, configuration* conf) { +int runNds(u32 cluster, u32 saveCluster, u32 donorTwlCluster, /* u32 gbaCluster, u32 gbaSavCluster, */ u32 wideCheatCluster, u32 apPatchCluster, u32 cheatCluster, u32 patchOffsetCacheCluster, u32 ramDumpCluster, u32 srParamsCluster, u32 screenshotCluster, u32 apFixOverlaysCluster, u32 musicCluster, u32 pageFileCluster, u32 manualCluster, u32 sharedFontCluster, configuration* conf) { nocashMessage("runNds"); // Load bootloader binary @@ -262,12 +262,12 @@ int runNds(u32 cluster, u32 saveCluster, u32 donorTwlCluster, u32 gbaCluster, u3 loader->donorFileCluster = donorTwlCluster; loader->donorFileSize = conf->donorFileSize; loader->donorFileOffset = conf->donorFileOffset; - loader->gbaFileCluster = gbaCluster; - loader->gbaSaveFileCluster = gbaSavCluster; + // loader->gbaFileCluster = gbaCluster; + // loader->gbaSaveFileCluster = gbaSavCluster; loader->romSize = conf->romSize; loader->saveSize = conf->saveSize; - loader->gbaRomSize = conf->gbaRomSize; - loader->gbaSaveSize = conf->gbaSaveSize; + // loader->gbaRomSize = conf->gbaRomSize; + // loader->gbaSaveSize = conf->gbaSaveSize; loader->dataToPreloadAddr[0] = conf->dataToPreloadAddr[0]; loader->dataToPreloadAddr[1] = conf->dataToPreloadAddr[1]; loader->dataToPreloadSize[0] = conf->dataToPreloadSize[0]; diff --git a/retail/bootloader/source/arm7/load_crt0.s b/retail/bootloader/source/arm7/load_crt0.s index ca53f9b6a..22a23e3ec 100644 --- a/retail/bootloader/source/arm7/load_crt0.s +++ b/retail/bootloader/source/arm7/load_crt0.s @@ -35,12 +35,12 @@ .global donorFileCluster .global donorFileSize .global donorFileOffset - .global gbaFileCluster - .global gbaSaveFileCluster + @ .global gbaFileCluster + @ .global gbaSaveFileCluster .global romSize .global saveSize - .global gbaRomSize - .global gbaSaveSize + @ .global gbaRomSize + @ .global gbaSaveSize .global dataToPreloadAddr .global dataToPreloadSize .global wideCheatFileCluster @@ -106,18 +106,18 @@ donorFileSize: .word 0x00000000 @ SDK5 donor .nds file size donorFileOffset: .word 0x00000000 @ SDK5 donor .nds file offset -gbaFileCluster: - .word 0x00000000 @ .gba file -gbaSaveFileCluster: - .word 0x00000000 @ .GBA .sav file +@gbaFileCluster: +@ .word 0x00000000 @ .gba file +@gbaSaveFileCluster: +@ .word 0x00000000 @ .GBA .sav file romSize: .word 0x00000000 @ .nds file size saveSize: .word 0x00000000 @ .sav file size -gbaRomSize: - .word 0x00000000 @ .gba file size -gbaSaveSize: - .word 0x00000000 @ GBA .sav file size +@gbaRomSize: +@ .word 0x00000000 @ .gba file size +@gbaSaveSize: +@ .word 0x00000000 @ GBA .sav file size dataToPreloadAddr: .word 0x00000000 .word 0x00000000 diff --git a/retail/bootloaderi/source/arm7/load_crt0.s b/retail/bootloaderi/source/arm7/load_crt0.s index ca53f9b6a..22a23e3ec 100644 --- a/retail/bootloaderi/source/arm7/load_crt0.s +++ b/retail/bootloaderi/source/arm7/load_crt0.s @@ -35,12 +35,12 @@ .global donorFileCluster .global donorFileSize .global donorFileOffset - .global gbaFileCluster - .global gbaSaveFileCluster + @ .global gbaFileCluster + @ .global gbaSaveFileCluster .global romSize .global saveSize - .global gbaRomSize - .global gbaSaveSize + @ .global gbaRomSize + @ .global gbaSaveSize .global dataToPreloadAddr .global dataToPreloadSize .global wideCheatFileCluster @@ -106,18 +106,18 @@ donorFileSize: .word 0x00000000 @ SDK5 donor .nds file size donorFileOffset: .word 0x00000000 @ SDK5 donor .nds file offset -gbaFileCluster: - .word 0x00000000 @ .gba file -gbaSaveFileCluster: - .word 0x00000000 @ .GBA .sav file +@gbaFileCluster: +@ .word 0x00000000 @ .gba file +@gbaSaveFileCluster: +@ .word 0x00000000 @ .GBA .sav file romSize: .word 0x00000000 @ .nds file size saveSize: .word 0x00000000 @ .sav file size -gbaRomSize: - .word 0x00000000 @ .gba file size -gbaSaveSize: - .word 0x00000000 @ GBA .sav file size +@gbaRomSize: +@ .word 0x00000000 @ .gba file size +@gbaSaveSize: +@ .word 0x00000000 @ GBA .sav file size dataToPreloadAddr: .word 0x00000000 .word 0x00000000 diff --git a/retail/bootloaderi/source/arm7/main.arm7.c b/retail/bootloaderi/source/arm7/main.arm7.c index 5e0763a2e..64028ec0a 100644 --- a/retail/bootloaderi/source/arm7/main.arm7.c +++ b/retail/bootloaderi/source/arm7/main.arm7.c @@ -103,8 +103,8 @@ extern u32 gbaFileCluster; extern u32 gbaSaveFileCluster; extern u32 romSize; extern u32 saveSize; -extern u32 gbaRomSize; -extern u32 gbaSaveSize; +// extern u32 gbaRomSize; +// extern u32 gbaSaveSize; extern u32 dataToPreloadAddr[2]; extern u32 dataToPreloadSize[2]; extern u32 wideCheatFileCluster; diff --git a/retail/common/include/load_crt0.h b/retail/common/include/load_crt0.h index aaab15976..ef4b840ac 100644 --- a/retail/common/include/load_crt0.h +++ b/retail/common/include/load_crt0.h @@ -24,8 +24,8 @@ typedef struct loadCrt0 { u32 gbaSaveFileCluster; u32 romSize; u32 saveSize; - u32 gbaRomSize; - u32 gbaSaveSize; + // u32 gbaRomSize; + // u32 gbaSaveSize; u32 dataToPreloadAddr[2]; u32 dataToPreloadSize[2]; u32 wideCheatFileCluster;