From f78347000cd1893e39132189e25d931c0429ae09 Mon Sep 17 00:00:00 2001 From: fangrong Date: Thu, 5 Sep 2024 15:05:08 +0800 Subject: [PATCH] Do not create dummy file anymore, no need to reset TWLCFG if region changing for jpn --- arm9/source/main.cpp | 58 +------------------------------------------ template.7z | Bin 100552 -> 101262 bytes 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp index a839363..222c7f4 100644 --- a/arm9/source/main.cpp +++ b/arm9/source/main.cpp @@ -363,9 +363,6 @@ int main( int argc, char **argv) { iprintf("\n"); if ((cursorPosition == 0) && (optionCount > 2)) { iprintf(" Change the SDNAND region.\n"); - if (regionChar == 'J') { - iprintf(" System settings will be reset.\n"); - } iprintf(" \n"); iprintf(" Original region: "); if (regionChar == 'J') { @@ -461,17 +458,11 @@ int main( int argc, char **argv) { if (newRegion != oldRegion) { FILE* f_hwinfoS = fopen("sd:/sys/HWINFO_S.dat", "rb+"); if (f_hwinfoS) { - u32 supportedLangBitmask = 0x01; // JPN: Japanese + u32 supportedLangBitmask = 0x3F; // Japanese, English, French, German, Italian, Spanish if (newRegion == 5) { // KOR supportedLangBitmask = 0x80; // Korean } else if (newRegion == 4) { // CHN supportedLangBitmask = 0x40; // Chinese - } else if (newRegion == 3) { // AUS - supportedLangBitmask = 0x02; // English - } else if (newRegion == 2) { // EUR - supportedLangBitmask = 0x3E; // English, French, German, Italian, Spanish - } else if (newRegion == 1) { // USA - supportedLangBitmask = 0x26; // English, French, Spanish } fseek(f_hwinfoS, 0x88, SEEK_SET); fwrite(&supportedLangBitmask, sizeof(u32), 1, f_hwinfoS); @@ -479,53 +470,6 @@ int main( int argc, char **argv) { fwrite(&newRegion, 1, 1, f_hwinfoS); fclose(f_hwinfoS); } - if (regionChar == 'J') { - // Reset system settings to work around touch inputs not working - remove("sd:/shared1/TWLCFG0.dat"); - remove("sd:/shared1/TWLCFG1.dat"); - } - } - - // Create dummy file - // Check the free space - struct statvfs st; - statvfs("sd:/", &st); - u32 freeSpace = st.f_bsize * st.f_bfree; - u64 realFreeSpace = st.f_bsize * st.f_bfree; - - // If the free space is bigger than 2GiB (using a u32 so always 0 - 4GiB) - // or the free space is less than 20MiB (and the actual free space is over 4GiB) - if(freeSpace > (2u << 30) || (freeSpace < (20u << 20) && realFreeSpace > (4u << 30))) { - consoleDemoInit(); - size_t oldSize = 0; - // Check old dummy file size to see if it can just be removed - FILE *file = fopen("sd:/hiya/dummy.bin", "rb"); - if(file) { - fseek(file, 0, SEEK_END); - oldSize = ftell(file); - fclose(file); - } - - // Check that dummy file is still needed - if((freeSpace + oldSize) > (2u << 30) || (freeSpace + oldSize) < (20u << 20)) { - // Make sure hiya directory exists and make the file - mkdir("sd:/hiya", 0777); - iprintf("Making new dummy file... "); - - // Make sure the file exists - file = fopen("sd:/hiya/dummy.bin", "wb"); - if(file) - fclose(file); - - // If free space is less than 20MiB, add free space + 2GiB + 10MiB - // otherwise add free space - 2GiB + 10MiB - truncate("sd:/hiya/dummy.bin", (freeSpace < (20u << 20) ? (freeSpace + (2 << 30)) : (freeSpace - (2 << 30))) + (10 << 20)); - iprintf("Done!\n"); - } else { - iprintf("Removing old dummy file... "); - remove("sd:/hiya/dummy.bin"); - iprintf("Done!\n"); - } } if (!gotoSettings && (*(u32*)0x02000300 == 0x434E4C54)) { diff --git a/template.7z b/template.7z index ad5bf4ca79c136654a0669e094a8aa085138c6e8..8aa6ae95e2de27fe4f1fbf24891a5516a0803890 100644 GIT binary patch delta 1577 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