From 653858fdda8acee3ee9bfe4251ca97e0a37c82d7 Mon Sep 17 00:00:00 2001 From: Kronos2308 <36446521+Kronos2308@users.noreply.github.com> Date: Sat, 14 Dec 2019 12:04:51 +0000 Subject: [PATCH] update for new lib --- Hakupayload/src/utils/util.c | 2 +- compile.cmd | 2 + romfs/Haku33_payload.bin | Bin 53166 -> 53194 bytes source/main.cpp | 106 +++++++++++++++++------------------ 4 files changed, 56 insertions(+), 54 deletions(-) diff --git a/Hakupayload/src/utils/util.c b/Hakupayload/src/utils/util.c index 5bf3f15..58f495b 100644 --- a/Hakupayload/src/utils/util.c +++ b/Hakupayload/src/utils/util.c @@ -233,7 +233,7 @@ display_backlight_brightness(0, 1000); g_gfx_con.scale = 3; gfx_con_setpos(&g_gfx_con, 10, 10); gfx_con_setcol(&g_gfx_con, 0xFF008F39, 0xFF726F68, 0xFF191414); - gfx_printf(&g_gfx_con, "BootStrapNX\n"); + gfx_printf(&g_gfx_con, "BootStrapNX\n Haku33 has finish the Clean\n"); gfx_con_setcol(&g_gfx_con, 0xFFF9F9F9, 0, 0xFF191414); gfx_con_setpos(&g_gfx_con, 950, 10); gfx_printf(&g_gfx_con, "Battery: -%d%-", (battPercent >> 8) & 0xFF, (battPercent & 0xFF)); diff --git a/compile.cmd b/compile.cmd index eccb65f..ccc59d1 100644 --- a/compile.cmd +++ b/compile.cmd @@ -6,6 +6,8 @@ dir /b *.nro>%temp%\filete.txt set /p File=<%temp%\filete.txt del "%temp%\filete.txt" title -%IP% - %File% +make -C Hakupayload/ +cp ./Hakupayload/payload.bin ./romfs/Haku33_payload.bin -f -v make set a=%errorlevel% echo ------------------------------------------ diff --git a/romfs/Haku33_payload.bin b/romfs/Haku33_payload.bin index 4ed14ef157c259ba4ec6dd4659a7cd5929ab68d3..7a1112f172a929849a0f6779b8d4712e00bd5b1a 100644 GIT binary patch delta 506 zcmZ2CpZU~$<_Rsl7yKC=LK+wxK=g`<6Wv)Qf*Bn?Y`nXfk@3UiiA?QG62Y6Ln7=Ur z>B&NDdO$%(Hh;#7$rIU(1wRBaI)Ic1$}l?o1mc{@SJ__kRscmR+ZY`F{%2q)*?g9L zHXCEj=1e|rCdQh{r2?;+ID#f837P?^&9elp=GTkekk$_OpT%f7qO8wwx8Hozvzy6Oj677p^3j1Ja?y zvt;RES=Bc{f9n8E;{ej2FgSDO z%zuWv|Np!AGCFtwF$*v(FHB~ftj`5f3E~0$Y&H27&}h*qv)LfQHhJ5WXQ05HH+2(} zASe_){1_c(0PztZ{xCUlhP>_-Aghdtf#HUf@qZ4WDJDR?3CNEC(ltOVr~m4I2at}C xW?)#ddF_nvrm_kiiP@#b#tIpU#R_Sed6~r-3MCn-3eGvHiFsU`m!9Kf1OPPFv)BLt delta 478 zcmX9*Nl0Ts5UuJ@zPrg6#BEem1TQY&auCrkj3!{l5EaY}9`a)jiVI#8JP01d<)on% zf`XnzFC%Ib8PJ1+H;M9L5C*}khEWg?aXAcawH_X?s`|a^>gw|?ZEs6knakSuq1iVJ zrsBm&#O-+PLDN3C5r{UAum$$oBMP-=M$B{c8Y;HyJ`C`PUT@eWRdW9qG~Wnbex=`M z1$xn(o(J>41n3hNDH}Qth~exEh68-kbpfeSRL~P^_ z5-p7_r(mWim^>@4jMJMlsawKNV^AEA$0giI`Slx`9zvoU&3%r%HeD%IMsIHB*VH<9 zbwmGL8$VjTRm 0); @@ -199,66 +199,66 @@ bool install() //terminate System proc printf("\x1b[32;1m*\x1b[0m Kill System Services\n"); consoleUpdate(NULL); - pmshellTerminateProcessByTitleId(0x010000000000000C);//btca - pmshellTerminateProcessByTitleId(0x010000000000000E);//friends - pmshellTerminateProcessByTitleId(0x010000000000001E);//account - pmshellTerminateProcessByTitleId(0x010000000000001F);//ns - pmshellTerminateProcessByTitleId(0x0100000000000020);//nfc - pmshellTerminateProcessByTitleId(0x0100000000000022);//capsrv - pmshellTerminateProcessByTitleId(0x0100000000000024);//ssl - pmshellTerminateProcessByTitleId(0x0100000000000025);//nim - pmshellTerminateProcessByTitleId(0x010000000000002B);//erpt - pmshellTerminateProcessByTitleId(0x010000000000002E);//pctl - pmshellTerminateProcessByTitleId(0x010000000000002F);//npns - pmshellTerminateProcessByTitleId(0x0100000000000030);//eupld - pmshellTerminateProcessByTitleId(0x0100000000000033);//es - pmshellTerminateProcessByTitleId(0x0100000000000036);//creport - pmshellTerminateProcessByTitleId(0x010000000000003A);//migration - pmshellTerminateProcessByTitleId(0x010000000000003E);//olsc - pmshellTerminateProcessByTitleId(0x0100000000001000);//qlaunch - make freeze? - pmshellTerminateProcessByTitleId(0x0100000000001009);//miiEdit + pmshellTerminateProgram(0x010000000000000C);//btca + pmshellTerminateProgram(0x010000000000000E);//friends + pmshellTerminateProgram(0x010000000000001E);//account + pmshellTerminateProgram(0x010000000000001F);//ns + pmshellTerminateProgram(0x0100000000000020);//nfc + pmshellTerminateProgram(0x0100000000000022);//capsrv + pmshellTerminateProgram(0x0100000000000024);//ssl + pmshellTerminateProgram(0x0100000000000025);//nim + pmshellTerminateProgram(0x010000000000002B);//erpt + pmshellTerminateProgram(0x010000000000002E);//pctl + pmshellTerminateProgram(0x010000000000002F);//npns + pmshellTerminateProgram(0x0100000000000030);//eupld + pmshellTerminateProgram(0x0100000000000033);//es + pmshellTerminateProgram(0x0100000000000036);//creport + pmshellTerminateProgram(0x010000000000003A);//migration + pmshellTerminateProgram(0x010000000000003E);//olsc + pmshellTerminateProgram(0x0100000000001000);//qlaunch - make freeze? + pmshellTerminateProgram(0x0100000000001009);//miiEdit //serv test may freeze printf("\x1b[32;1m*\x1b[0m Kill Extra Services\n"); consoleUpdate(NULL); -/* pmshellTerminateProcessByTitleId(0x0100000000000020); //nfc - pmshellTerminateProcessByTitleId(0x0100000000000021); //psc -// pmshellTerminateProcessByTitleId(0x0100000000000023); //am make freeze - pmshellTerminateProcessByTitleId(0x0100000000000024); //ssl - pmshellTerminateProcessByTitleId(0x010000000000002E); //pctl - pmshellTerminateProcessByTitleId(0x010000000000002F); //npns - pmshellTerminateProcessByTitleId(0x0100000000000034); //fatal -// pmshellTerminateProcessByTitleId(0x0100000000000037); //ro make freeze - pmshellTerminateProcessByTitleId(0x0100000000000039); //sdb - pmshellTerminateProcessByTitleId(0x010000000000003E); //olsc -*/ pmshellTerminateProcessByTitleId(0x0100000000002071); //posi (ns) - pmshellTerminateProcessByTitleId(0x0100000000000809); //used by sdb +/* pmshellTerminateProgram(0x0100000000000020); //nfc + pmshellTerminateProgram(0x0100000000000021); //psc +// pmshellTerminateProgram(0x0100000000000023); //am make freeze + pmshellTerminateProgram(0x0100000000000024); //ssl + pmshellTerminateProgram(0x010000000000002E); //pctl + pmshellTerminateProgram(0x010000000000002F); //npns + pmshellTerminateProgram(0x0100000000000034); //fatal +// pmshellTerminateProgram(0x0100000000000037); //ro make freeze + pmshellTerminateProgram(0x0100000000000039); //sdb + pmshellTerminateProgram(0x010000000000003E); //olsc +*/ pmshellTerminateProgram(0x0100000000002071); //posi (ns) + pmshellTerminateProgram(0x0100000000000809); //used by sdb //critical serv printf("\x1b[32;1m*\x1b[0m terminate Critical Services\n"); consoleUpdate(NULL); - pmshellTerminateProcessByTitleId(0x0100000000000012);//bsdsockets - make switch freeze on sxos ftp - pmshellTerminateProcessByTitleId(0x0100000000000009);//settings - make switch freeze on airplane mode - pmshellTerminateProcessByTitleId(0x010000000000000F);//nifm - pmshellTerminateProcessByTitleId(0x0100000000000016);//Wlan + pmshellTerminateProgram(0x0100000000000012);//bsdsockets - make switch freeze on sxos ftp + pmshellTerminateProgram(0x0100000000000009);//settings - make switch freeze on airplane mode + pmshellTerminateProgram(0x010000000000000F);//nifm + pmshellTerminateProgram(0x0100000000000016);//Wlan //terminate Homebrew Serv printf("\x1b[32;1m*\x1b[0m Kill Homebrew Services\n"); consoleUpdate(NULL); - pmshellTerminateProcessByTitleId(0x420000000000000E);//FTP - pmshellTerminateProcessByTitleId(0x0100000000000352);//Emuiio - pmshellTerminateProcessByTitleId(0x200000000000010);//Lan Play - pmshellTerminateProcessByTitleId(0x0100000000000FAF);//HDI - pmshellTerminateProcessByTitleId(0x420000000000000B);//sysplay - pmshellTerminateProcessByTitleId(0x00FF0000636C6BFF);//sys-clk - pmshellTerminateProcessByTitleId(0x0100000000534C56);//ReverseNX - pmshellTerminateProcessByTitleId(0x0100000000000069);//ReiSpoof + pmshellTerminateProgram(0x420000000000000E);//FTP + pmshellTerminateProgram(0x0100000000000352);//Emuiio + pmshellTerminateProgram(0x200000000000010);//Lan Play + pmshellTerminateProgram(0x0100000000000FAF);//HDI + pmshellTerminateProgram(0x420000000000000B);//sysplay + pmshellTerminateProgram(0x00FF0000636C6BFF);//sys-clk + pmshellTerminateProgram(0x0100000000534C56);//ReverseNX + pmshellTerminateProgram(0x0100000000000069);//ReiSpoof //mount system printf("\x1b[32;1m*\x1b[0m mount system\n"); consoleUpdate(NULL); FsFileSystem mySystem; - fsOpenBisFileSystem(&mySystem, FsBisStorageId_System, ""); + fsOpenBisFileSystem(&mySystem, FsBisPartitionId_System, ""); fsdevMountDevice("myssytem", mySystem); //delete system printf("\x1b[32;1m*\x1b[0m Delete system\n"); @@ -277,7 +277,7 @@ bool install() printf("\x1b[32;1m*\x1b[0m mount User\n"); consoleUpdate(NULL); FsFileSystem myUser; - fsOpenBisFileSystem(&myUser, FsBisStorageId_User, ""); + fsOpenBisFileSystem(&myUser, FsBisPartitionId_User, ""); fsdevMountDevice("myUser", myUser); //delete user printf("\x1b[32;1m*\x1b[0m delete User\n"); @@ -348,7 +348,7 @@ if (kHeld & KEY_PLUS) consoleInit(NULL); printf("\x1b[32;1m*\x1b[0m %s v%s Kronos2308, Hard Reset\n",TITLE, VERSION); - if(isSpanish()) + if(isSpanish) { printf("\n\x1b[30;1m TU CONSOLA SERA COMPLETAMENTE LIMPADA: SAVES, JUEGOS, ETC \x1b[0m\n"); printf("\n\x1b[30;1m SE REALIZARA UN HARD RESET LUEGO SE APAGARA LA CONSOLA \x1b[0m\n");