diff --git a/Makefile b/Makefile index 355dd72..b05c4b7 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ INCLUDES := include EXEFS_SRC := exefs_src APP_TITLE := Haku33 APP_AUTHOR := Kronos2308 -APP_VERSION := 4.8 +APP_VERSION := 5.2 ROMFS := romfs #--------------------------------------------------------------------------------- diff --git a/icon.jpg b/icon.jpg index 4054b57..982fbf4 100644 Binary files a/icon.jpg and b/icon.jpg differ diff --git a/romfs/README.md b/romfs/README.md deleted file mode 100644 index 51dc46a..0000000 --- a/romfs/README.md +++ /dev/null @@ -1,9 +0,0 @@ -## EN -* 1 Copy [startup.te](startup.te?raw=true) to the SD Root -* 2 Inject The payload [TegraExplorer.bin](https://github.com/StarDustCFW/Haku33/raw/master/romfs/TegraExplorer.bin) -## ES -* 1 Copia [startup.te](startup.te?raw=true) a la raiz de la SD -* 2 injecta [TegraExplorer.bin](https://github.com/StarDustCFW/Haku33/raw/master/romfs/TegraExplorer.bin) via RCM - -#### [Descargar-Downloads](https://github.com/StarDustCFW/Haku33/archive/master.zip) -### [Releases](https://github.com/StarDustCFW/Haku33/releases/latest) diff --git a/romfs/TegraExplorer.bin b/romfs/TegraExplorer.bin index 4e2d522..00bd1c7 100644 Binary files a/romfs/TegraExplorer.bin and b/romfs/TegraExplorer.bin differ diff --git a/romfs/ini/Haku33.bmp b/romfs/ini/Haku33.bmp deleted file mode 100644 index 764238b..0000000 Binary files a/romfs/ini/Haku33.bmp and /dev/null differ diff --git a/romfs/ini/Haku33.ini b/romfs/ini/Haku33.ini deleted file mode 100644 index 2df161d..0000000 --- a/romfs/ini/Haku33.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Haku33] -payload=/Haku33.bin -icon=/bootloader/res/Haku33.bmp diff --git a/romfs/startup.te b/romfs/startup.te index a27619e..d75df5b 100644 --- a/romfs/startup.te +++ b/romfs/startup.te @@ -1,5 +1,5 @@ #REQUIRE KEYS -is=["8000000000000120","80000000000000d1","8000000000000047"] +is=["8000000000000120","8000000000000047"] p=println pr=print pe={pause() exit()} @@ -34,7 +34,7 @@ p("\n\nCleaning!") movefile("sd:/Nintendo", "sd:/Hamburgesa_Nintendo") movefile("sd:/Nintendo", "sd:/Hamburgesa_Nintendo_1") -delfile("sd:/Haku33.bin") +delfile("sd:/TegraExplorer.bin") delfile("sd:/startup.te") delfile("sd:/Haku33.nro") delfile("sd:/Switch/Haku33.nro") diff --git a/romfs/startup_mariko.te b/romfs/startup_mariko.te new file mode 100644 index 0000000..f3f9af9 --- /dev/null +++ b/romfs/startup_mariko.te @@ -0,0 +1,37 @@ +#REQUIRE KEYS +is=["8000000000000120","8000000000000047"] +p=println +pr=print +pe={pause() exit()} +println("Haku33 Kronos2308 Hard Reset, Kronos2308 - Fork from TegraExplorer") +wait={t=timer()while(timer()<(t+tw)){print("Wait for",(t+tw-timer()/1000),"seconds \r")}} +p("System wiper\n") +mount=mountsys +if(mount("SYSTEM")){p("Mount failed!")pe()} +color(0x0000FF) +p("Press power to wipe, any other key to exit")a=pause()if(!a.power){exit()}clear() +color(0xFF0000) +pr("Deleting system saves... ") +f=readdir("bis:/save") +if(f.folders.len()!=0){p("Folders in save dir???")pe()} +f.files.foreach("x"){if(!is.contains(x)){if(delfile("bis:/save/"+x)){p("File deletion failed: ", x)pe()}}} +pr("Done!\nDeleting user dirs...")ud=["Album","Contents","save","saveMeta","temp"] +if(mount("USER")){p("Mount failed!")pe()} +ud.foreach("x"){pr("\n"+x,"")if(deldir("bis:/"+x)){p("Dir deletion failed")pe()}mkdir("bis:/"+x)} +mkdir("bis:/Contents/placehld")mkdir("bis:/Contents/registered") +color(0x00FF00) +p("\n\nCleaning!") + +movefile("sd:/Nintendo", "sd:/Hamburgesa_Nintendo") +movefile("sd:/Nintendo", "sd:/Hamburgesa_Nintendo_1") + +delfile("sd:/TegraExplorer.bin") +delfile("sd:/startup.te") +delfile("sd:/Haku33.nro") +delfile("sd:/Switch/Haku33.nro") +delfile("sd:/Switch/Haku33/Haku33.nro") +movefile("sd:/payload.bin.bak", "sd:/payload.bin") + +p("\n\nDone!") +p("\n\nPress Any button to full power off!") +power(3) \ No newline at end of file diff --git a/source/main.cpp b/source/main.cpp index daebe00..a00c2ba 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -127,24 +127,25 @@ void CheckHardware() } void SetupClean (){ - copy_me("romfs:/TegraExplorer.bin", "/Haku33.bin"); - copy_me("romfs:/startup.te", "/startup.te"); if (is_patched){ - led_on(1); //force boot copy_me("romfs:/boot.dat", "/boot.dat"); - copy_me("romfs:/boot.ini", "boot.ini"); + copy_me("romfs:/boot.ini", "/boot.ini"); //copy keys mkdir("sdmc:/bootloader",0777); copy_me("romfs:/hekate_keys.ini", "/bootloader/hekate_keys.ini"); //copy Start mkdir("sdmc:/bootloader/res",0777); mkdir("sdmc:/bootloader/ini",0777); - copy_me("romfs:/ini/Haku33.bmp", "/bootloader/res/Haku33.bmp"); - copy_me("romfs:/ini/Haku33.ini", "/bootloader/ini/Haku33.ini"); + rename("/payload.bin","/payload.bin.bak"); + copy_me("romfs:/TegraExplorer.bin", "/payload.bin"); + copy_me("romfs:/startup_mariko.te", "/startup.te"); + led_on(1); spsmInitialize(); spsmShutdown(true); }else{ + copy_me("romfs:/TegraExplorer.bin", "/TegraExplorer.bin"); + copy_me("romfs:/startup.te", "/startup.te"); led_on(1); bpcInitialize(); if(init_slp()){reboot_to_payload();} diff --git a/source/spl.cpp b/source/spl.cpp index 8f240be..fa36d2e 100644 --- a/source/spl.cpp +++ b/source/spl.cpp @@ -44,7 +44,7 @@ namespace spl if (R_FAILED(ret = splGetConfig(SplConfigItem_HardwareType, &hardware_type))) { - return hardware[4]; + return hardware[6]; } else return hardware[hardware_type];