From eab222583ab519d5ab9060ed0b5e0b34f3e1a9ae Mon Sep 17 00:00:00 2001 From: Kronos2308 <36446521+Kronos2308@users.noreply.github.com> Date: Sat, 25 Apr 2020 22:25:53 +0100 Subject: [PATCH] some bug fix --- .gitignore | 1 + Makefile | 4 +++- source/lang.hpp | 16 ++++++++-------- source/main.cpp | 16 +++++++++++++++- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 697bb36..0dcf356 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ build/* img *.rar Haku33--88/* +libnx/* diff --git a/Makefile b/Makefile index 1c6c706..cac38a8 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,8 @@ $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/de endif TOPDIR ?= $(CURDIR) +LIBNX = $(TOPDIR)/libnx +include $(LIBNX)/switch_rules include $(DEVKITPRO)/libnx/switch_rules #--------------------------------------------------------------------------------- @@ -38,7 +40,7 @@ INCLUDES := include EXEFS_SRC := exefs_src APP_TITLE := Haku33 APP_AUTHOR := Kronos2308 -APP_VERSION := 2.8 +APP_VERSION := 2.9 ROMFS := romfs #--------------------------------------------------------------------------------- diff --git a/source/lang.hpp b/source/lang.hpp index 073b852..3d67e22 100644 --- a/source/lang.hpp +++ b/source/lang.hpp @@ -66,11 +66,11 @@ language LG; LG.text2 = "\n\x1b[30;1m SE REALIZARA UN HARD RESET LUEGO SE APAGARA LA CONSOLA \x1b[0m\n"; LG.text3 = "\n\x1b[30;1m SI NO SABES LO QUE HACES, PRESIONA B PARA ABORTAR \x1b[0m\n"; LG.text4 = "\n\n\x1b[30;1m-------- LO DEVORARE TODO --------\x1b[0m\n\n"; - LG.text5 = "PULSA \x1b[3%u;1m ZL\x1b[3%u;1m -\x1b[3%u;1m +\x1b[3%u;1m ZR \x1b[0m JUNTOS PARA LIMPIAR\n\n"; + LG.text5 = "\n\nPULSA \x1b[3%u;1m ZL\x1b[3%u;1m -\x1b[3%u;1m +\x1b[3%u;1m ZR \x1b[0m JUNTOS PARA LIMPIAR\n\n"; LG.text6 = "\x1b[33;1m*\x1b[0m Recuerda Desinstalar Incognito Desde Incognito-RCM\n\n"; - LG.text7 = "\x1b[31;1m*\x1b[0m Desactiva el Modo Avion "; - LG.text8 = "usar las 90DNS (Requerido)\n\n\x1b[33;1m*\x1b[0m DNS Primario: 163.172.141.219\n\n\x1b[33;1m*\x1b[0m DNS Secundario: 207.246.121.77\n\n"; - LG.text9 = "\n\x1b[33;1m*\x1b[0m Si se congela mucho tiempo, Es que ha fallado. Pulsa POWER 15s \n\n"; + LG.text7 = "\x1b[33;1m*\x1b[0m Recuerda Desactivar el Modo Avion "; + LG.text8 = "y borrar todas las redes de Internet\n\n"; + LG.text9 = "\n\x1b[33;1m*\x1b[0m Si se congela mucho tiempo, Es que ha fallado. Pulsa POWER 15s \n\ny haslo de nuevo\n\n"; LG.text0 = "\x1b[32;1m*\x1b[0m Desabilitando FTP de SXOS\n"; LG.text11 = "\x1b[32;1m*\x1b[0m Esto no esta pensado para uasrse en EMU\n"; break; @@ -79,11 +79,11 @@ language LG; LG.text2 = "\n\x1b[30;1m A HARD RESET WILL BE PERFORMED AFTER THE CONSOLE WILL BE OFF \x1b[0m\n"; LG.text3 = "\n\x1b[30;1m IF YOU DON'T KNOW WHAT YOU DO, PRESS B FOR ABORT \x1b[0m\n"; LG.text4 = "\n\n\x1b[30;1m-------- I WILL CONSUME EVERYTHING --------\x1b[0m\n\n"; - LG.text5 = "PRESS \x1b[3%u;1m ZL\x1b[3%u;1m -\x1b[3%u;1m +\x1b[3%u;1m ZR \x1b[0m TOGETHER TO CLEAN\n\n"; + LG.text5 = "\n\nPRESS \x1b[3%u;1m ZL\x1b[3%u;1m -\x1b[3%u;1m +\x1b[3%u;1m ZR \x1b[0m TOGETHER TO CLEAN\n\n"; LG.text6 = "\x1b[33;1m*\x1b[0m Remember Uninstall Incognito from Incognito-RCM\n\n"; - LG.text7 = "\x1b[31;1m*\x1b[0m Disable Airplane mode "; - LG.text8 = "and use 90DNS(Required)\n\n\x1b[33;1m*\x1b[0m Primary DNS: 163.172.141.219\n\n\x1b[33;1m*\x1b[0m Secondary DNS: 207.246.121.77\n\n"; - LG.text9 = "\n\x1b[33;1m*\x1b[0m If it freezes for a long time, It has failed. Press POWER 15s\n\n"; + LG.text7 = "\x1b[33;1m*\x1b[0m Rememmber to Disable the Airplane mode "; + LG.text8 = "and delete all net configs\n\n"; + LG.text9 = "\n\x1b[33;1m*\x1b[0m If it freezes for a long time, It has failed. Press POWER 15s \n\nand try again \n\n"; LG.text0 = "\x1b[32;1m*\x1b[0m Disabling SXOS FTP\n"; LG.text11 = "\x1b[32;1m*\x1b[0m This is not intended to be used at EMU\n"; break; diff --git a/source/main.cpp b/source/main.cpp index 99ae90c..2dd00f8 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -148,6 +148,20 @@ bool isEMU = false; if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000534C56))){printf("ReverseNX-");} if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000000FAF))){printf("HDI-");} if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000000069))){printf("ReiSpoof-");} + + if (R_SUCCEEDED(pmshellTerminateProgram(0x420000000000000E))){printf("FTP-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000000352))){printf("Emuiio-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x4200000000000010))){printf("LanPlay-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000000BEF))){printf("Disk-USB-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x4200000000000000))){printf("SysTune-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x690000000000000D))){printf("Sys-Con-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x420000000007E51A))){printf("TeslaOVL-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x00FF0000A53BB665))){printf("SysDVR-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x00FF0000636C6BFF))){printf("Sys-Clk-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x420000000000000B))){printf("SysPlay-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x0000000000534C56))){printf("ReverseNX-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000000069))){printf("ReiSpoof-");} + if (R_SUCCEEDED(pmshellTerminateProgram(0x0100000000000FAF))){printf("HDI-");} //DeInitialize printf("\n\x1b[32;1m*\x1b[0m DeInitialize\n"); @@ -307,7 +321,6 @@ int main(int argc, char **argv) printf(LG.text2); printf(LG.text3); printf(LG.text4); - printf(LG.text5,LT,minus,more,RT); if(strlen(incognito()) == 0)//detect incognito printf(LG.text6); if(!HasConnection())//detect airplane mode for evoid freeze @@ -316,6 +329,7 @@ int main(int argc, char **argv) if (!issxos)//extra warning if you are not on sxos printf(LG.text8); } + printf(LG.text5,LT,minus,more,RT); consoleUpdate(NULL);