From 1e1d61f15f1c104165bad2848d294d90ee8c2ce6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-SN9KF5O\\Strawberry" <berichandev@gmail.com>
Date: Sat, 15 Nov 2025 21:11:53 +0000
Subject: [PATCH 01/13] Bump version

---
 sys-botbase/source/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index e4c0e22..2aac48f 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -17,7 +17,7 @@
 #define TITLE_ID 0x430000000000000B
 #define HEAP_SIZE 0x00480000
 #define THREAD_SIZE 0x1A000
-#define VERSION_S "2.4"
+#define VERSION_S "2.41"
 
 typedef enum {
     Active = 0,

From 8af8edd152b237b4b3312ee8b8e17217414086da Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Sat, 7 Feb 2026 00:06:03 -0600
Subject: [PATCH 02/13] Handle potential errors from readMem

---
 sys-botbase/source/commands.c | 51 +++++++++++++++++++++++++++--------
 sys-botbase/source/commands.h |  2 +-
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index c4885a6..bf29c47 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -243,8 +243,13 @@ void peek(u64 offset, u64 size)
 {
     u8 *out = malloc(sizeof(u8) * size);
     attach();
-    readMem(out, offset, size);
-    detach();
+    Result rc = readMem(out, offset, size);
+    if (R_FAILED(rc))
+    {
+        detach();
+        free(out);
+        return;
+    }
 
     u64 i;
     for (i = 0; i < size; i++)
@@ -252,6 +257,7 @@ void peek(u64 offset, u64 size)
         printf("%02X", out[i]);
     }
     printf("\n");
+    detach();
     free(out);
 }
 
@@ -267,7 +273,14 @@ void peekInfinite(u64 offset, u64 size)
     {
         u64 thisBuffersize = sizeRemainder > MAX_LINE_LENGTH ? MAX_LINE_LENGTH : sizeRemainder;
         sizeRemainder -= thisBuffersize;
-        readMem(out, offset + totalFetched, thisBuffersize);
+        Result rc = readMem(out, offset + totalFetched, thisBuffersize);
+        if (R_FAILED(rc))
+        {
+            detach();
+            free(out);
+            return;
+        }
+
         for (i = 0; i < thisBuffersize; i++)
         {
             printf("%02X", out[i]);
@@ -291,10 +304,15 @@ void peekMulti(u64* offset, u64* size, u64 count)
     attach();
     for (int i = 0; i < count; i++)
     {
-        readMem(out + ofs, offset[i], size[i]);
+        Result rc = readMem(out + ofs, offset[i], size[i]);
+        if (R_FAILED(rc))
+        {
+            detach();
+            free(out);
+            return;
+        }
         ofs += size[i];
     }
-    detach();
 
     u64 i;
     for (i = 0; i < totalSize; i++)
@@ -302,14 +320,16 @@ void peekMulti(u64* offset, u64* size, u64 count)
         printf("%02X", out[i]);
     }
     printf("\n");
+    detach();
     free(out);
 }
 
-void readMem(u8* out, u64 offset, u64 size)
+Result readMem(u8* out, u64 offset, u64 size)
 {
-	Result rc = svcReadDebugProcessMemory(out, debughandle, offset, size);
+    Result rc = svcReadDebugProcessMemory(out, debughandle, offset, size);
     if (R_FAILED(rc) && debugResultCodes)
         printf("svcReadDebugProcessMemory: %d\n", rc);
+    return rc;
 }
 
 void click(HidNpadButton btn)
@@ -375,14 +395,23 @@ u64 followMainPointer(s64* jumps, size_t count)
 	MetaData meta = getMetaData(); 
 	
 	attach();
-	readMem(out, meta.main_nso_base + jumps[0], size);
+    Result rc = readMem(out, meta.main_nso_base + jumps[0], size);
+    if (R_FAILED(rc))
+    {
+        detach();
+        free(out);
+        return 0;
+    }
 	offset = *(u64*)out;
+
 	int i;
     for (i = 1; i < count; ++i)
 	{
-		readMem(out, offset + jumps[i], size);
-		offset = *(u64*)out;
-        // this traversal resulted in an error
+        rc = readMem(out, offset + jumps[i], size);
+        if (R_FAILED(rc))
+            break;
+        offset = *(u64*)out;
+        // This traversal resulted in an error
         if (offset == 0)
             break;
 	}
diff --git a/sys-botbase/source/commands.h b/sys-botbase/source/commands.h
index a8fbc6d..293b5fa 100644
--- a/sys-botbase/source/commands.h
+++ b/sys-botbase/source/commands.h
@@ -54,7 +54,7 @@ void writeMem(u64 offset, u64 size, u8* val);
 void peek(u64 offset, u64 size);
 void peekInfinite(u64 offset, u64 size);
 void peekMulti(u64* offset, u64* size, u64 count);
-void readMem(u8* out, u64 offset, u64 size);
+Result readMem(u8* out, u64 offset, u64 size);
 void click(HidNpadButton btn);
 void press(HidNpadButton btn);
 void release(HidNpadButton btn);

From b3b0ebf0f4b5f456a0573d61a89d7a206d8b3c8c Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Sat, 7 Feb 2026 00:11:27 -0600
Subject: [PATCH 03/13] Standardize formatting, white space, and pointer
 declaration

---
 sys-botbase/source/args.c     |  14 +-
 sys-botbase/source/args.h     |   2 +-
 sys-botbase/source/commands.c | 174 ++++-----
 sys-botbase/source/freeze.c   | 114 +++---
 sys-botbase/source/freeze.h   |  12 +-
 sys-botbase/source/main.c     | 681 +++++++++++++++++-----------------
 sys-botbase/source/util.c     |  61 +--
 sys-botbase/source/util.h     |   4 +-
 sys-botbase/sys-botbase.json  | 368 +++++++++---------
 9 files changed, 719 insertions(+), 711 deletions(-)

diff --git a/sys-botbase/source/args.c b/sys-botbase/source/args.c
index 171fc0f..8f907d9 100644
--- a/sys-botbase/source/args.c
+++ b/sys-botbase/source/args.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-int parseArgs(char *origargstr, int (*callback)(int, char **))
+int parseArgs(char* origargstr, int (*callback)(int, char**))
 {
-    char *argstr = malloc(strlen(origargstr) + 1);
+    char* argstr = malloc(strlen(origargstr) + 1);
     memcpy(argstr, origargstr, strlen(origargstr) + 1);
     int argc = 0;
 
-    char *tmpstr = malloc(strlen(argstr) + 1);
+    char* tmpstr = malloc(strlen(argstr) + 1);
     memcpy(tmpstr, argstr, strlen(argstr) + 1);
-    for (char *p = strtok(tmpstr, " \r\n"); p != NULL; p = strtok(NULL, " \r\n")) {
+    for (char* p = strtok(tmpstr, " \r\n"); p != NULL; p = strtok(NULL, " \r\n")) {
         argc++;
     }
     free(tmpstr);
@@ -20,13 +20,13 @@ int parseArgs(char *origargstr, int (*callback)(int, char **))
         return (*callback)(argc, NULL);
     }
 
-    char **argv = malloc(sizeof(char *) * argc);
+    char** argv = malloc(sizeof(char*) * argc);
     int i = 0;
-    for (char *p = strtok(argstr, " \r\n"); p != NULL; p = strtok(NULL, " \r\n")) 
+    for (char* p = strtok(argstr, " \r\n"); p != NULL; p = strtok(NULL, " \r\n"))
         argv[i++] = p;
 
     int ret = (*callback)(argc, argv);
     free(argv);
     free(argstr);
     return ret;
-}
\ No newline at end of file
+}
diff --git a/sys-botbase/source/args.h b/sys-botbase/source/args.h
index bf46a9b..b86a56e 100644
--- a/sys-botbase/source/args.h
+++ b/sys-botbase/source/args.h
@@ -1 +1 @@
-int parseArgs(char* argstr, int (*callback)(int, char**));
\ No newline at end of file
+int parseArgs(char* argstr, int (*callback)(int, char**));
diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index bf29c47..d92112f 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -11,21 +11,21 @@
 //Controller:
 bool bControllerIsInitialised = false;
 HidDeviceType controllerInitializedType = HidDeviceType_FullKey3;
-HiddbgHdlsHandle controllerHandle = {0};
-HiddbgHdlsDeviceInfo controllerDevice = {0};
-HiddbgHdlsState controllerState = {0};
+HiddbgHdlsHandle controllerHandle = { 0 };
+HiddbgHdlsDeviceInfo controllerDevice = { 0 };
+HiddbgHdlsState controllerState = { 0 };
 
 //Keyboard:
-HiddbgKeyboardAutoPilotState dummyKeyboardState = {0};
+HiddbgKeyboardAutoPilotState dummyKeyboardState = { 0 };
 
 Handle debughandle = 0;
 u64 buttonClickSleepTime = 50;
 u64 keyPressSleepTime = 25;
 u64 pollRate = 17; // polling is linked to screen refresh rate (system UI) or game framerate. Most cases this is 1/60 or 1/30
 u32 fingerDiameter = 50;
-HiddbgHdlsSessionId sessionId = {0};
-bool initflag=0;
-u8 *workmem = NULL;
+HiddbgHdlsSessionId sessionId = { 0 };
+bool initflag = 0;
+u8* workmem = NULL;
 size_t workmem_size = 0x1000;
 
 void attach()
@@ -43,28 +43,29 @@ void attach()
         printf("svcDebugActiveProcess: %d\n", rc);
 }
 
-void detach(){
+void detach() {
     if (debughandle != 0)
         svcCloseHandle(debughandle);
 }
 
-u64 getMainNsoBase(u64 pid){
+u64 getMainNsoBase(u64 pid) {
     LoaderModuleInfo proc_modules[2];
     s32 numModules = 0;
     Result rc = ldrDmntGetProcessModuleInfo(pid, proc_modules, 2, &numModules);
     if (R_FAILED(rc) && debugResultCodes)
         printf("ldrDmntGetProcessModuleInfo: %d\n", rc);
 
-    LoaderModuleInfo *proc_module = 0;
-    if(numModules == 2){
+    LoaderModuleInfo* proc_module = 0;
+    if (numModules == 2) {
         proc_module = &proc_modules[1];
-    }else{
+    }
+    else {
         proc_module = &proc_modules[0];
     }
     return proc_module->base_address;
 }
 
-u64 getHeapBase(Handle handle){
+u64 getHeapBase(Handle handle) {
     u64 heap_base = 0;
     Result rc = svcGetInfo(&heap_base, InfoType_HeapRegionAddress, debughandle, 0);
     if (R_FAILED(rc) && debugResultCodes)
@@ -73,7 +74,7 @@ u64 getHeapBase(Handle handle){
     return heap_base;
 }
 
-u64 getTitleId(u64 pid){
+u64 getTitleId(u64 pid) {
     u64 titleId = 0;
     Result rc = pminfoGetProgramId(&titleId, pid);
     if (R_FAILED(rc) && debugResultCodes)
@@ -81,15 +82,15 @@ u64 getTitleId(u64 pid){
     return titleId;
 }
 
-u64 GetTitleVersion(u64 pid){
+u64 GetTitleVersion(u64 pid) {
     u64 titleV = 0;
     s32 out;
 
     Result rc = nsInitialize();
-	if (R_FAILED(rc)) 
+    if (R_FAILED(rc))
         fatalThrow(rc);
 
-    NsApplicationContentMetaStatus *MetaStatus = malloc(sizeof(NsApplicationContentMetaStatus[100U]));
+    NsApplicationContentMetaStatus* MetaStatus = malloc(sizeof(NsApplicationContentMetaStatus[100U]));
     rc = nsListApplicationContentMetaStatus(getTitleId(pid), 0, MetaStatus, 100, &out);
     if (R_FAILED(rc) && debugResultCodes)
         printf("nsListApplicationContentMetaStatus: %d\n", rc);
@@ -103,7 +104,7 @@ u64 GetTitleVersion(u64 pid){
     return (titleV / 0x10000);
 }
 
-u64 getoutsize(NsApplicationControlData* buf){
+u64 getoutsize(NsApplicationControlData* buf) {
     Result rc = nsInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
@@ -117,32 +118,33 @@ u64 getoutsize(NsApplicationControlData* buf){
     nsExit();
     return outsize;
 }
-void getBuildID(MetaData* meta, u64 pid){
+void getBuildID(MetaData* meta, u64 pid) {
     LoaderModuleInfo proc_modules[2];
     s32 numModules = 0;
     Result rc = ldrDmntGetProcessModuleInfo(pid, proc_modules, 2, &numModules);
     if (R_FAILED(rc) && debugResultCodes)
         printf("ldrDmntGetProcessModuleInfo: %d\n", rc);
 
-    LoaderModuleInfo *proc_module = 0;
-    if(numModules == 2){
+    LoaderModuleInfo* proc_module = 0;
+    if (numModules == 2) {
         proc_module = &proc_modules[1];
-    }else{
+    }
+    else {
         proc_module = &proc_modules[0];
     }
     memcpy(meta->buildID, proc_module->build_id, 0x20);
 }
 
-MetaData getMetaData(){
+MetaData getMetaData() {
     MetaData meta;
     attach();
-    u64 pid = 0;    
+    u64 pid = 0;
     Result rc = pmdmntGetApplicationProcessId(&pid);
     if (R_FAILED(rc) && debugResultCodes)
         printf("pmdmntGetApplicationProcessId: %d\n", rc);
-    
+
     meta.main_nso_base = getMainNsoBase(pid);
-    meta.heap_base =  getHeapBase(debughandle);
+    meta.heap_base = getHeapBase(debughandle);
     meta.titleID = getTitleId(pid);
     meta.titleVersion = GetTitleVersion(pid);
     getBuildID(&meta, pid);
@@ -153,7 +155,7 @@ MetaData getMetaData(){
 
 bool getIsProgramOpen(u64 id)
 {
-    u64 pid = 0;    
+    u64 pid = 0;
     Result rc = pmdmntGetProcessId(&pid, id);
     if (pid == 0 || R_FAILED(rc))
         return false;
@@ -163,32 +165,32 @@ bool getIsProgramOpen(u64 id)
 
 void initController()
 {
-    if(bControllerIsInitialised) return;
+    if (bControllerIsInitialised) return;
     //taken from switchexamples github
     Result rc = hiddbgInitialize();
-	
-	//old
+
+    //old
     //if (R_FAILED(rc) && debugResultCodes)
     //printf("hiddbgInitialize: %d\n", rc);
-    
-	//new
-	if (R_FAILED(rc) && debugResultCodes) {
+
+    //new
+    if (R_FAILED(rc) && debugResultCodes) {
         printf("hiddbgInitialize(): 0x%x\n", rc);
     }
     else {
         workmem = aligned_alloc(0x1000, workmem_size);
         if (workmem) initflag = 1;
         else printf("workmem alloc failed\n");
-    }    
-	
-	// Set the controller type to Pro-Controller, and set the npadInterfaceType.
+    }
+
+    // Set the controller type to Pro-Controller, and set the npadInterfaceType.
     controllerDevice.deviceType = controllerInitializedType;
     controllerDevice.npadInterfaceType = HidNpadInterfaceType_Bluetooth;
     // Set the controller colors. The grip colors are for Pro-Controller on [9.0.0+].
-    controllerDevice.singleColorBody = RGBA8_MAXALPHA(255,255,255);
-    controllerDevice.singleColorButtons = RGBA8_MAXALPHA(0,0,0);
-    controllerDevice.colorLeftGrip = RGBA8_MAXALPHA(230,255,0);
-    controllerDevice.colorRightGrip = RGBA8_MAXALPHA(0,40,20);
+    controllerDevice.singleColorBody = RGBA8_MAXALPHA(255, 255, 255);
+    controllerDevice.singleColorButtons = RGBA8_MAXALPHA(0, 0, 0);
+    controllerDevice.colorLeftGrip = RGBA8_MAXALPHA(230, 255, 0);
+    controllerDevice.colorRightGrip = RGBA8_MAXALPHA(0, 40, 20);
 
     // Setup example controller state.
     controllerState.battery_level = 4; // Set battery charge to full.
@@ -219,7 +221,7 @@ void detachController()
     if (R_FAILED(rc) && debugResultCodes)
         printf("hiddbgReleaseHdlsWorkBuffer: %d\n", rc);
     hiddbgExit();
-	free(workmem);
+    free(workmem);
     bControllerIsInitialised = false;
 
     sessionId.id = 0;
@@ -234,14 +236,14 @@ void poke(u64 offset, u64 size, u8* val)
 
 void writeMem(u64 offset, u64 size, u8* val)
 {
-	Result rc = svcWriteDebugProcessMemory(debughandle, val, offset, size);
+    Result rc = svcWriteDebugProcessMemory(debughandle, val, offset, size);
     if (R_FAILED(rc) && debugResultCodes)
         printf("svcWriteDebugProcessMemory: %d\n", rc);
 }
 
 void peek(u64 offset, u64 size)
 {
-    u8 *out = malloc(sizeof(u8) * size);
+    u8* out = malloc(sizeof(u8) * size);
     attach();
     Result rc = readMem(out, offset, size);
     if (R_FAILED(rc))
@@ -266,7 +268,7 @@ void peekInfinite(u64 offset, u64 size)
     u64 sizeRemainder = size;
     u64 totalFetched = 0;
     u64 i;
-    u8 *out = malloc(sizeof(u8) * MAX_LINE_LENGTH);
+    u8* out = malloc(sizeof(u8) * MAX_LINE_LENGTH);
 
     attach();
     while (sizeRemainder > 0)
@@ -298,8 +300,8 @@ void peekMulti(u64* offset, u64* size, u64 count)
     u64 totalSize = 0;
     for (int i = 0; i < count; i++)
         totalSize += size[i];
-    
-    u8 *out = malloc(sizeof(u8) * totalSize);
+
+    u8* out = malloc(sizeof(u8) * totalSize);
     u64 ofs = 0;
     attach();
     for (int i = 0; i < count; i++)
@@ -362,15 +364,15 @@ void setStickState(int side, int dxVal, int dyVal)
 {
     initController();
     if (side == JOYSTICK_LEFT)
-    {	
+    {
         controllerState.analog_stick_l.x = dxVal;
-		controllerState.analog_stick_l.y = dyVal;
-	}
-	else
-	{
-		controllerState.analog_stick_r.x = dxVal;
-		controllerState.analog_stick_r.y = dyVal;
-	}
+        controllerState.analog_stick_l.y = dyVal;
+    }
+    else
+    {
+        controllerState.analog_stick_r.x = dxVal;
+        controllerState.analog_stick_r.y = dyVal;
+    }
     hiddbgSetHdlsState(controllerHandle, &controllerState);
 }
 
@@ -379,22 +381,22 @@ void reverseArray(u8* arr, int start, int end)
     int temp;
     while (start < end)
     {
-        temp = arr[start];   
+        temp = arr[start];
         arr[start] = arr[end];
         arr[end] = temp;
         start++;
         end--;
-    }   
-} 
+    }
+}
 
-u64 followMainPointer(s64* jumps, size_t count) 
+u64 followMainPointer(s64* jumps, size_t count)
 {
-	u64 offset;
+    u64 offset;
     u64 size = sizeof offset;
-	u8 *out = malloc(size);
-	MetaData meta = getMetaData(); 
-	
-	attach();
+    u8* out = malloc(size);
+    MetaData meta = getMetaData();
+
+    attach();
     Result rc = readMem(out, meta.main_nso_base + jumps[0], size);
     if (R_FAILED(rc))
     {
@@ -402,11 +404,11 @@ u64 followMainPointer(s64* jumps, size_t count)
         free(out);
         return 0;
     }
-	offset = *(u64*)out;
+    offset = *(u64*)out;
 
-	int i;
+    int i;
     for (i = 1; i < count; ++i)
-	{
+    {
         rc = readMem(out, offset + jumps[i], size);
         if (R_FAILED(rc))
             break;
@@ -414,10 +416,10 @@ u64 followMainPointer(s64* jumps, size_t count)
         // This traversal resulted in an error
         if (offset == 0)
             break;
-	}
-	detach();
-	free(out);
-	
+    }
+    detach();
+    free(out);
+
     return offset;
 }
 
@@ -439,19 +441,19 @@ void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold, u
             break;
     }
 
-    if(hold) // send finger release event
+    if (hold) // send finger release event
     {
         hiddbgSetTouchScreenAutoPilotState(NULL, 0);
         svcSleepThread(pollRate * 1e+6L);
     }
-    
+
     hiddbgUnsetTouchScreenAutoPilotState();
 }
 
 void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount)
 {
     initController();
-    HiddbgKeyboardAutoPilotState tempState = {0};
+    HiddbgKeyboardAutoPilotState tempState = { 0 };
     u32 i;
     for (i = 0; i < sequentialCount; i++)
     {
@@ -460,9 +462,9 @@ void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount)
         hiddbgSetKeyboardAutoPilotState(&tempState);
         svcSleepThread(keyPressSleepTime * 1e+6L);
 
-        if (i != (sequentialCount-1))
+        if (i != (sequentialCount - 1))
         {
-            if (memcmp(states[i].keys, states[i+1].keys, sizeof(u64) * 4) == 0 && states[i].modifiers == states[i+1].modifiers)
+            if (memcmp(states[i].keys, states[i + 1].keys, sizeof(u64) * 4) == 0 && states[i].modifiers == states[i + 1].modifiers)
             {
                 hiddbgSetKeyboardAutoPilotState(&dummyKeyboardState);
                 svcSleepThread(pollRate * 1e+6L);
@@ -487,7 +489,7 @@ void clickSequence(char* seq, u8* token)
     const char startLStick = '%';
     const char startRStick = '&';
     char* command = strtok(seq, &delim);
-    HidNpadButton currKey = {0};
+    HidNpadButton currKey = { 0 };
     u64 currentWait = 0;
 
     initController();
@@ -500,28 +502,28 @@ void clickSequence(char* seq, u8* token)
         {
             // l stick
             s64 x = parseStringToSignedLong(&command[1]);
-            if(x > JOYSTICK_MAX) x = JOYSTICK_MAX; 
-            if(x < JOYSTICK_MIN) x = JOYSTICK_MIN; 
+            if (x > JOYSTICK_MAX) x = JOYSTICK_MAX;
+            if (x < JOYSTICK_MIN) x = JOYSTICK_MIN;
             s64 y = 0;
             command = strtok(NULL, &delim);
             if (command != NULL)
                 y = parseStringToSignedLong(command);
-            if(y > JOYSTICK_MAX) y = JOYSTICK_MAX;
-            if(y < JOYSTICK_MIN) y = JOYSTICK_MIN;
+            if (y > JOYSTICK_MAX) y = JOYSTICK_MAX;
+            if (y < JOYSTICK_MIN) y = JOYSTICK_MIN;
             setStickState(JOYSTICK_LEFT, (s32)x, (s32)y);
         }
         else if (!strncmp(command, &startRStick, 1))
         {
             // r stick
             s64 x = parseStringToSignedLong(&command[1]);
-            if(x > JOYSTICK_MAX) x = JOYSTICK_MAX; 
-            if(x < JOYSTICK_MIN) x = JOYSTICK_MIN; 
+            if (x > JOYSTICK_MAX) x = JOYSTICK_MAX;
+            if (x < JOYSTICK_MIN) x = JOYSTICK_MIN;
             s64 y = 0;
             command = strtok(NULL, &delim);
             if (command != NULL)
                 y = parseStringToSignedLong(command);
-            if(y > JOYSTICK_MAX) y = JOYSTICK_MAX;
-            if(y < JOYSTICK_MIN) y = JOYSTICK_MIN;
+            if (y > JOYSTICK_MAX) y = JOYSTICK_MAX;
+            if (y < JOYSTICK_MIN) y = JOYSTICK_MIN;
             setStickState(JOYSTICK_RIGHT, (s32)x, (s32)y);
         }
         else if (!strncmp(command, &startPress, 1))
@@ -529,13 +531,13 @@ void clickSequence(char* seq, u8* token)
             // press
             currKey = parseStringToButton(&command[1]);
             press(currKey);
-        }  
+        }
         else if (!strncmp(command, &startRelease, 1))
         {
             // release
             currKey = parseStringToButton(&command[1]);
             release(currKey);
-        }   
+        }
         else if (!strncmp(command, &startWait, 1))
         {
             // wait
diff --git a/sys-botbase/source/freeze.c b/sys-botbase/source/freeze.c
index 994a5e3..15cb95a 100644
--- a/sys-botbase/source/freeze.c
+++ b/sys-botbase/source/freeze.c
@@ -12,89 +12,89 @@ FreezeBlock* freezes;
 
 void initFreezes(void)
 {
-	freezes = calloc(FREEZE_DIC_LENGTH, sizeof(FreezeBlock));
+    freezes = calloc(FREEZE_DIC_LENGTH, sizeof(FreezeBlock));
 }
 
 void freeFreezes(void)
 {
-	free(freezes);
+    free(freezes);
 }
 
 int findAddrSlot(u64 addr)
 {
-	for (int i = 0; i < FREEZE_DIC_LENGTH; i++)
-	{
-		if (freezes[i].address == addr)
-			return i;
-	}
-	
-	return -1;
+    for (int i = 0; i < FREEZE_DIC_LENGTH; i++)
+    {
+        if (freezes[i].address == addr)
+            return i;
+    }
+
+    return -1;
 }
 
 int findNextEmptySlot()
 {
-	return findAddrSlot(0);
+    return findAddrSlot(0);
 }
 
 int addToFreezeMap(u64 addr, u8* v_data, u64 v_size, u64 tid)
 {
-	// update slot if already exists
-	int slot = findAddrSlot(addr);
-	if (slot == -1)
-		slot = findNextEmptySlot();
-	else
-		removeFromFreezeMap(addr);
-	
-	if (slot == -1)
-		return 0;
-	
-	freezes[slot].address = addr;
-	freezes[slot].vData = v_data;
-	freezes[slot].size = v_size;
-	freezes[slot].state = 1;
-	freezes[slot].titleId = tid;
-	
-	return slot;
+    // update slot if already exists
+    int slot = findAddrSlot(addr);
+    if (slot == -1)
+        slot = findNextEmptySlot();
+    else
+        removeFromFreezeMap(addr);
+
+    if (slot == -1)
+        return 0;
+
+    freezes[slot].address = addr;
+    freezes[slot].vData = v_data;
+    freezes[slot].size = v_size;
+    freezes[slot].state = 1;
+    freezes[slot].titleId = tid;
+
+    return slot;
 }
 
 int removeFromFreezeMap(u64 addr)
 {
-	int slot = findAddrSlot(addr);
-	if (slot == -1)
-		return 0;
-	freezes[slot].address = 0;
-	freezes[slot].state = 0;
-	free(freezes[slot].vData);
-	return slot;
+    int slot = findAddrSlot(addr);
+    if (slot == -1)
+        return 0;
+    freezes[slot].address = 0;
+    freezes[slot].state = 0;
+    free(freezes[slot].vData);
+    return slot;
 }
 
 int getFreezeCount(bool print)
 {
-	int count = 0;
-	for (int i = 0; i < FREEZE_DIC_LENGTH; i++)
-	{
-		if (freezes[i].state != 0)
-			++count;
-	}
-	if (print)
-	{
-		printf("%02X", count);
-		printf("\n");
-	}
-	return count;
+    int count = 0;
+    for (int i = 0; i < FREEZE_DIC_LENGTH; i++)
+    {
+        if (freezes[i].state != 0)
+            ++count;
+    }
+    if (print)
+    {
+        printf("%02X", count);
+        printf("\n");
+    }
+    return count;
 }
 
 // returns 0 if there was nothing to clear
 u8 clearFreezes(void)
 {
-	u8 clearedOne = 0;
-	for (int i = 0; i < FREEZE_DIC_LENGTH; i++)
-	{
-		if (freezes[i].state != 0)
-		{
-			removeFromFreezeMap(freezes[i].address);
-			clearedOne = 1;
-		}
-	}
-	return clearedOne;
-}
\ No newline at end of file
+    u8 clearedOne = 0;
+    for (int i = 0; i < FREEZE_DIC_LENGTH; i++)
+    {
+        if (freezes[i].state != 0)
+        {
+            removeFromFreezeMap(freezes[i].address);
+            clearedOne = 1;
+        }
+    }
+    return clearedOne;
+}
diff --git a/sys-botbase/source/freeze.h b/sys-botbase/source/freeze.h
index 6344b76..b5ce56e 100644
--- a/sys-botbase/source/freeze.h
+++ b/sys-botbase/source/freeze.h
@@ -2,11 +2,11 @@
 #define FREEZE_DIC_LENGTH 255
 
 typedef struct {
-	char state;
-	u64 address;
-	u8* vData;
-	u64 size;
-	u64 titleId;
+    char state;
+    u64 address;
+    u8* vData;
+    u64 size;
+    u64 titleId;
 } FreezeBlock;
 
 extern FreezeBlock* freezes;
@@ -18,4 +18,4 @@ int findNextEmptySlot();
 int addToFreezeMap(u64 addr, u8* v_data, u64 v_size, u64 tid);
 int removeFromFreezeMap(u64 addr);
 int getFreezeCount(bool print);
-u8 clearFreezes(void);
\ No newline at end of file
+u8 clearFreezes(void);
diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index 2aac48f..ed50b80 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -29,20 +29,20 @@ typedef enum {
 Thread freezeThread, touchThread, keyboardThread, clickThread;
 
 // prototype thread functions to give the illusion of cleanliness
-void sub_freeze(void *arg);
-void sub_touch(void *arg);
-void sub_key(void *arg);
-void sub_click(void *arg);
+void sub_freeze(void* arg);
+void sub_touch(void* arg);
+void sub_key(void* arg);
+void sub_click(void* arg);
 
 // locks for thread
 Mutex freezeMutex, touchMutex, keyMutex, clickMutex;
 
 // events for releasing or idling threads
-FreezeThreadState freeze_thr_state = Active; 
+FreezeThreadState freeze_thr_state = Active;
 u8 clickThreadState = 0; // 1 = break thread
 // key and touch events currently being processed
-KeyData currentKeyEvent = {0};
-TouchData currentTouchEvent = {0};
+KeyData currentKeyEvent = { 0 };
+TouchData currentTouchEvent = { 0 };
 char* currentClick = NULL;
 
 // for cancelling the touch/click thread
@@ -59,13 +59,13 @@ u32 __nx_applet_type = AppletType_None;
 // we override libnx internals to do a minimal init
 void __libnx_initheap(void)
 {
-	static u8 inner_heap[HEAP_SIZE];
+    static u8 inner_heap[HEAP_SIZE];
     extern void* fake_heap_start;
     extern void* fake_heap_end;
 
     // Configure the newlib heap.
     fake_heap_start = inner_heap;
-    fake_heap_end   = inner_heap + sizeof(inner_heap);
+    fake_heap_end = inner_heap + sizeof(inner_heap);
 }
 
 void __appInit(void)
@@ -86,14 +86,14 @@ void __appInit(void)
         }
     }
     rc = pmdmntInitialize();
-	if (R_FAILED(rc)) 
+    if (R_FAILED(rc))
         fatalThrow(rc);
     rc = ldrDmntInitialize();
-	if (R_FAILED(rc)) 
-		fatalThrow(rc);
+    if (R_FAILED(rc))
+        fatalThrow(rc);
     rc = pminfoInitialize();
-	if (R_FAILED(rc)) 
-		fatalThrow(rc);
+    if (R_FAILED(rc))
+        fatalThrow(rc);
     rc = socketInitializeDefault();
     if (R_FAILED(rc))
         fatalThrow(rc);
@@ -149,7 +149,7 @@ void makeClickSeq(char* seq)
     mutexUnlock(&clickMutex);
 }
 
-int argmain(int argc, char **argv)
+int argmain(int argc, char** argv)
 {
     if (argc == 0)
         return 0;
@@ -158,7 +158,7 @@ int argmain(int argc, char **argv)
     //peek <address in hex or dec> <amount of bytes in hex or dec>
     if (!strcmp(argv[0], "peek"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
 
         MetaData meta = getMetaData();
@@ -170,26 +170,26 @@ int argmain(int argc, char **argv)
 
     if (!strcmp(argv[0], "peekMulti"))
     {
-        if(argc < 3 || argc % 2 == 0)
+        if (argc < 3 || argc % 2 == 0)
             return 0;
 
         MetaData meta = getMetaData();
 
-        u64 itemCount = (argc - 1)/2;
+        u64 itemCount = (argc - 1) / 2;
         u64 offsets[itemCount];
         u64 sizes[itemCount];
 
         for (int i = 0; i < itemCount; ++i)
         {
-            offsets[i] = meta.heap_base + parseStringToInt(argv[(i*2)+1]);
-            sizes[i] = parseStringToInt(argv[(i*2)+2]);
+            offsets[i] = meta.heap_base + parseStringToInt(argv[(i * 2) + 1]);
+            sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
     }
 
     if (!strcmp(argv[0], "peekAbsolute"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
 
         u64 offset = parseStringToInt(argv[1]);
@@ -199,24 +199,24 @@ int argmain(int argc, char **argv)
 
     if (!strcmp(argv[0], "peekAbsoluteMulti"))
     {
-        if(argc < 3 || argc % 2 == 0)
+        if (argc < 3 || argc % 2 == 0)
             return 0;
 
-        u64 itemCount = (argc - 1)/2;
+        u64 itemCount = (argc - 1) / 2;
         u64 offsets[itemCount];
         u64 sizes[itemCount];
 
         for (int i = 0; i < itemCount; ++i)
         {
-            offsets[i] = parseStringToInt(argv[(i*2)+1]);
-            sizes[i] = parseStringToInt(argv[(i*2)+2]);
+            offsets[i] = parseStringToInt(argv[(i * 2) + 1]);
+            sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
     }
 
     if (!strcmp(argv[0], "peekMain"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
 
         MetaData meta = getMetaData();
@@ -228,19 +228,19 @@ int argmain(int argc, char **argv)
 
     if (!strcmp(argv[0], "peekMainMulti"))
     {
-        if(argc < 3 || argc % 2 == 0)
+        if (argc < 3 || argc % 2 == 0)
             return 0;
 
         MetaData meta = getMetaData();
 
-        u64 itemCount = (argc - 1)/2;
+        u64 itemCount = (argc - 1) / 2;
         u64 offsets[itemCount];
         u64 sizes[itemCount];
 
         for (int i = 0; i < itemCount; ++i)
         {
-            offsets[i] = meta.main_nso_base + parseStringToInt(argv[(i*2)+1]);
-            sizes[i] = parseStringToInt(argv[(i*2)+2]);
+            offsets[i] = meta.main_nso_base + parseStringToInt(argv[(i * 2) + 1]);
+            sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
     }
@@ -248,9 +248,9 @@ int argmain(int argc, char **argv)
     //poke <address in hex or dec> <data in hex or dec>
     if (!strcmp(argv[0], "poke"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
-            
+
         MetaData meta = getMetaData();
 
         u64 offset = parseStringToInt(argv[1]);
@@ -258,11 +258,11 @@ int argmain(int argc, char **argv)
         u8* data = parseStringToByteBuffer(argv[2], &size);
         poke(meta.heap_base + offset, size, data);
         free(data);
-    } 
-    
+    }
+
     if (!strcmp(argv[0], "pokeAbsolute"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
 
         u64 offset = parseStringToInt(argv[1]);
@@ -271,12 +271,12 @@ int argmain(int argc, char **argv)
         poke(offset, size, data);
         free(data);
     }
-        
+
     if (!strcmp(argv[0], "pokeMain"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
-            
+
         MetaData meta = getMetaData();
 
         u64 offset = parseStringToInt(argv[1]);
@@ -284,12 +284,12 @@ int argmain(int argc, char **argv)
         u8* data = parseStringToByteBuffer(argv[2], &size);
         poke(meta.main_nso_base + offset, size, data);
         free(data);
-    } 
+    }
 
     //click <buttontype>
     if (!strcmp(argv[0], "click"))
     {
-        if(argc != 2)
+        if (argc != 2)
             return 0;
         HidNpadButton key = parseStringToButton(argv[1]);
         click(key);
@@ -299,9 +299,9 @@ int argmain(int argc, char **argv)
     //syntax: <button>=click, 'W<number>'=wait/sleep thread, '+<button>'=press button, '-<button>'=release button, '%<x axis>,<y axis>'=move L stick <x axis, y axis>, '&<x axis>,<y axis>'=move R stick <x axis, y axis> 
     if (!strcmp(argv[0], "clickSeq"))
     {
-        if(argc != 2)
+        if (argc != 2)
             return 0;
-        
+
         u64 sizeArg = strlen(argv[1]) + 1;
         char* seqNew = malloc(sizeArg);
         strcpy(seqNew, argv[1]);
@@ -314,7 +314,7 @@ int argmain(int argc, char **argv)
     //hold <buttontype>
     if (!strcmp(argv[0], "press"))
     {
-        if(argc != 2)
+        if (argc != 2)
             return 0;
         HidNpadButton key = parseStringToButton(argv[1]);
         press(key);
@@ -323,7 +323,7 @@ int argmain(int argc, char **argv)
     //release <buttontype>
     if (!strcmp(argv[0], "release"))
     {
-        if(argc != 2)
+        if (argc != 2)
             return 0;
         HidNpadButton key = parseStringToButton(argv[1]);
         release(key);
@@ -332,40 +332,42 @@ int argmain(int argc, char **argv)
     //setStick <left or right stick> <x value> <y value>
     if (!strcmp(argv[0], "setStick"))
     {
-        if(argc != 4)
+        if (argc != 4)
             return 0;
-        
+
         int side = 0;
-        if(!strcmp(argv[1], "LEFT")){
+        if (!strcmp(argv[1], "LEFT")) {
             side = JOYSTICK_LEFT;
-        }else if(!strcmp(argv[1], "RIGHT")){
+        }
+        else if (!strcmp(argv[1], "RIGHT")) {
             side = JOYSTICK_RIGHT;
-        }else{
+        }
+        else {
             return 0;
         }
 
         int dxVal = strtol(argv[2], NULL, 0);
-        if(dxVal > JOYSTICK_MAX) dxVal = JOYSTICK_MAX; //0x7FFF
-        if(dxVal < JOYSTICK_MIN) dxVal = JOYSTICK_MIN; //-0x8000
+        if (dxVal > JOYSTICK_MAX) dxVal = JOYSTICK_MAX; //0x7FFF
+        if (dxVal < JOYSTICK_MIN) dxVal = JOYSTICK_MIN; //-0x8000
         int dyVal = strtol(argv[3], NULL, 0);
-        if(dyVal > JOYSTICK_MAX) dyVal = JOYSTICK_MAX;
-        if(dyVal < JOYSTICK_MIN) dyVal = JOYSTICK_MIN;
+        if (dyVal > JOYSTICK_MAX) dyVal = JOYSTICK_MAX;
+        if (dyVal < JOYSTICK_MIN) dyVal = JOYSTICK_MIN;
 
         setStickState(side, dxVal, dyVal);
     }
 
     //detachController
-    if(!strcmp(argv[0], "detachController"))
+    if (!strcmp(argv[0], "detachController"))
     {
         detachController();
     }
-    if (!strcmp(argv[0], "game")) 
+    if (!strcmp(argv[0], "game"))
     {
         if (argc != 2)
             return 0;
         NsApplicationControlData* buf = (NsApplicationControlData*)malloc(sizeof(NsApplicationControlData));
         u64 outsize = getoutsize(buf);
-        NacpLanguageEntry* langentry = NULL;    
+        NacpLanguageEntry* langentry = NULL;
         if (outsize != 0) {
             if (!strcmp(argv[1], "icon")) {
                 u64 i;
@@ -406,112 +408,112 @@ int argmain(int argc, char **argv)
         free(buf);
     }
     //configure <mainLoopSleepTime or buttonClickSleepTime> <time in ms>
-    if(!strcmp(argv[0], "configure")){
-        if(argc != 3)
+    if (!strcmp(argv[0], "configure")) {
+        if (argc != 3)
             return 0;
 
-        if(!strcmp(argv[1], "mainLoopSleepTime")){
+        if (!strcmp(argv[1], "mainLoopSleepTime")) {
             u64 time = parseStringToInt(argv[2]);
             mainLoopSleepTime = time;
         }
 
-        if(!strcmp(argv[1], "buttonClickSleepTime")){
+        if (!strcmp(argv[1], "buttonClickSleepTime")) {
             u64 time = parseStringToInt(argv[2]);
             buttonClickSleepTime = time;
         }
 
-        if(!strcmp(argv[1], "echoCommands")){
+        if (!strcmp(argv[1], "echoCommands")) {
             u64 shouldActivate = parseStringToInt(argv[2]);
             echoCommands = shouldActivate != 0;
         }
 
-        if(!strcmp(argv[1], "printDebugResultCodes")){
+        if (!strcmp(argv[1], "printDebugResultCodes")) {
             u64 shouldActivate = parseStringToInt(argv[2]);
             debugResultCodes = shouldActivate != 0;
         }
-        
-        if(!strcmp(argv[1], "keySleepTime")){
+
+        if (!strcmp(argv[1], "keySleepTime")) {
             u64 keyTime = parseStringToInt(argv[2]);
             keyPressSleepTime = keyTime;
         }
 
-        if(!strcmp(argv[1], "fingerDiameter")){
-            u32 fDiameter = (u32) parseStringToInt(argv[2]);
+        if (!strcmp(argv[1], "fingerDiameter")) {
+            u32 fDiameter = (u32)parseStringToInt(argv[2]);
             fingerDiameter = fDiameter;
         }
 
-        if(!strcmp(argv[1], "pollRate")){
+        if (!strcmp(argv[1], "pollRate")) {
             u64 fPollRate = parseStringToInt(argv[2]);
             pollRate = fPollRate;
         }
 
-        if(!strcmp(argv[1], "freezeRate")){
+        if (!strcmp(argv[1], "freezeRate")) {
             u64 fFreezeRate = parseStringToInt(argv[2]);
             freezeRate = fFreezeRate;
         }
 
-        if(!strcmp(argv[1], "controllerType")){
+        if (!strcmp(argv[1], "controllerType")) {
             detachController();
             u8 fControllerType = (u8)parseStringToInt(argv[2]);
             controllerInitializedType = fControllerType;
         }
     }
 
-    if(!strcmp(argv[0], "getTitleID")){
+    if (!strcmp(argv[0], "getTitleID")) {
         MetaData meta = getMetaData();
         printf("%016lX\n", meta.titleID);
     }
 
-    if(!strcmp(argv[0], "getTitleVersion")){
+    if (!strcmp(argv[0], "getTitleVersion")) {
         MetaData meta = getMetaData();
         printf("%016lX\n", meta.titleVersion);
     }
 
-    if(!strcmp(argv[0], "getSystemLanguage")){
+    if (!strcmp(argv[0], "getSystemLanguage")) {
         //thanks zaksa
         setInitialize();
-        u64 languageCode = 0;   
+        u64 languageCode = 0;
         SetLanguage language = SetLanguage_ENUS;
-        setGetSystemLanguage(&languageCode);   
+        setGetSystemLanguage(&languageCode);
         setMakeLanguage(languageCode, &language);
         printf("%d\n", language);
     }
- 
-    if(!strcmp(argv[0], "getMainNsoBase")){
+
+    if (!strcmp(argv[0], "getMainNsoBase")) {
         MetaData meta = getMetaData();
         printf("%016lX\n", meta.main_nso_base);
     }
-    
-    if(!strcmp(argv[0], "getBuildID")){
+
+    if (!strcmp(argv[0], "getBuildID")) {
         MetaData meta = getMetaData();
         printf("%02x%02x%02x%02x%02x%02x%02x%02x\n", meta.buildID[0], meta.buildID[1], meta.buildID[2], meta.buildID[3], meta.buildID[4], meta.buildID[5], meta.buildID[6], meta.buildID[7]);
 
     }
 
-    if(!strcmp(argv[0], "getHeapBase")){
+    if (!strcmp(argv[0], "getHeapBase")) {
         MetaData meta = getMetaData();
         printf("%016lX\n", meta.heap_base);
     }
 
-    if(!strcmp(argv[0], "isProgramRunning")){
-        if(argc != 2)
+    if (!strcmp(argv[0], "isProgramRunning")) {
+        if (argc != 2)
             return 0;
         u64 programId = parseStringToInt(argv[1]);
         bool isRunning = getIsProgramOpen(programId);
         printf("%d\n", isRunning);
     }
 
-    if(!strcmp(argv[0], "pixelPeek")){
+    if (!strcmp(argv[0], "pixelPeek")) {
         //errors with 0x668CE, unless debugunit flag is patched
         u64 bSize = 0x7D000;
-        char* buf = malloc(bSize); 
+        char* buf = malloc(bSize);
         u64 outSize = 0;
 
         Result rc = capsscCaptureForDebug(buf, bSize, &outSize);
 
         if (R_FAILED(rc) && debugResultCodes)
             printf("capssc, 1204: %d\n", rc);
-        
+
         u64 i;
         for (i = 0; i < outSize; i++)
         {
@@ -522,84 +524,84 @@ int argmain(int argc, char **argv)
         free(buf);
     }
 
-    if(!strcmp(argv[0], "getVersion")){
+    if (!strcmp(argv[0], "getVersion")) {
         printf("%s\n", VERSION_S);
     }
-	
-	// follow pointers and print absolute offset (little endian, flip it yourself if required)
-	// pointer <first (main) jump> <additional jumps> !!do not add the last jump in pointerexpr here, add it yourself!!
-	if (!strcmp(argv[0], "pointer"))
-	{
-		if(argc < 2)
+
+    // follow pointers and print absolute offset (little endian, flip it yourself if required)
+    // pointer <first (main) jump> <additional jumps> !!do not add the last jump in pointerexpr here, add it yourself!!
+    if (!strcmp(argv[0], "pointer"))
+    {
+        if (argc < 2)
             return 0;
-		s64 jumps[argc-1];
-		for (int i = 1; i < argc; i++)
-			jumps[i-1] = parseStringToSignedLong(argv[i]);
-		u64 solved = followMainPointer(jumps, argc-1);
-		printf("%016lX\n", solved);
-	}
+        s64 jumps[argc - 1];
+        for (int i = 1; i < argc; i++)
+            jumps[i - 1] = parseStringToSignedLong(argv[i]);
+        u64 solved = followMainPointer(jumps, argc - 1);
+        printf("%016lX\n", solved);
+    }
 
     // pointerAll <first (main) jump> <additional jumps> <final jump in pointerexpr> 
     // possibly redundant between the one above, one needs to go eventually. (little endian, flip it yourself if required)
-	if (!strcmp(argv[0], "pointerAll"))
-	{
-		if(argc < 3)
+    if (!strcmp(argv[0], "pointerAll"))
+    {
+        if (argc < 3)
             return 0;
-        s64 finalJump = parseStringToSignedLong(argv[argc-1]);
+        s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
         u64 count = argc - 2;
-		s64 jumps[count];
-		for (int i = 1; i < argc-1; i++)
-			jumps[i-1] = parseStringToSignedLong(argv[i]);
-		u64 solved = followMainPointer(jumps, count);
+        s64 jumps[count];
+        for (int i = 1; i < argc - 1; i++)
+            jumps[i - 1] = parseStringToSignedLong(argv[i]);
+        u64 solved = followMainPointer(jumps, count);
         if (solved != 0)
             solved += finalJump;
-		printf("%016lX\n", solved);
-	}
-	
-	// pointerRelative <first (main) jump> <additional jumps> <final jump in pointerexpr> 
-	// returns offset relative to heap
-	if (!strcmp(argv[0], "pointerRelative"))
-	{
-		if(argc < 3)
+        printf("%016lX\n", solved);
+    }
+
+    // pointerRelative <first (main) jump> <additional jumps> <final jump in pointerexpr> 
+    // returns offset relative to heap
+    if (!strcmp(argv[0], "pointerRelative"))
+    {
+        if (argc < 3)
             return 0;
-        s64 finalJump = parseStringToSignedLong(argv[argc-1]);
+        s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
         u64 count = argc - 2;
-		s64 jumps[count];
-		for (int i = 1; i < argc-1; i++)
-			jumps[i-1] = parseStringToSignedLong(argv[i]);
-		u64 solved = followMainPointer(jumps, count);
+        s64 jumps[count];
+        for (int i = 1; i < argc - 1; i++)
+            jumps[i - 1] = parseStringToSignedLong(argv[i]);
+        u64 solved = followMainPointer(jumps, count);
         if (solved != 0)
         {
             solved += finalJump;
             MetaData meta = getMetaData();
             solved -= meta.heap_base;
         }
-		printf("%016lX\n", solved);
-	}
+        printf("%016lX\n", solved);
+    }
 
     // pointerPeek <amount of bytes in hex or dec> <first (main) jump> <additional jumps> <final jump in pointerexpr>
     // warning: no validation
     if (!strcmp(argv[0], "pointerPeek"))
-	{
-		if(argc < 4)
+    {
+        if (argc < 4)
             return 0;
-            
-        s64 finalJump = parseStringToSignedLong(argv[argc-1]);
-		u64 size = parseStringToInt(argv[1]);
+
+        s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
+        u64 size = parseStringToInt(argv[1]);
         u64 count = argc - 3;
-		s64 jumps[count];
-		for (int i = 2; i < argc-1; i++)
-			jumps[i-2] = parseStringToSignedLong(argv[i]);
-		u64 solved = followMainPointer(jumps, count);
+        s64 jumps[count];
+        for (int i = 2; i < argc - 1; i++)
+            jumps[i - 2] = parseStringToSignedLong(argv[i]);
+        u64 solved = followMainPointer(jumps, count);
         solved += finalJump;
         peek(solved, size);
-	}
+    }
 
     // pointerPeekMulti <amount of bytes in hex or dec> <first (main) jump> <additional jumps> <final jump in pointerexpr> split by asterisks (*)
     // warning: no validation
     if (!strcmp(argv[0], "pointerPeekMulti"))
-	{
-		if(argc < 4)
+    {
+        if (argc < 4)
             return 0;
 
         // we guess a max of 40 for now
@@ -615,22 +617,22 @@ int argmain(int argc, char **argv)
             // count first
             char* thisArg = argv[currIndex];
             while (strcmp(thisArg, "*"))
-            {   
+            {
                 currIndex++;
                 if (currIndex < argc)
                     thisArg = argv[currIndex];
-                else 
+                else
                     break;
             }
-            
+
             u64 thisCount = currIndex - lastIndex;
-            
-            s64 finalJump = parseStringToSignedLong(argv[currIndex-1]);
+
+            s64 finalJump = parseStringToSignedLong(argv[currIndex - 1]);
             u64 size = parseStringToSignedLong(argv[lastIndex]);
             u64 count = thisCount - 2;
             s64 jumps[count];
-            for (int i = 1; i < count+1; i++)
-                jumps[i-1] = parseStringToSignedLong(argv[i+lastIndex]);
+            for (int i = 1; i < count + 1; i++)
+                jumps[i - 1] = parseStringToSignedLong(argv[i + lastIndex]);
             u64 solved = followMainPointer(jumps, count);
             solved += finalJump;
 
@@ -640,124 +642,124 @@ int argmain(int argc, char **argv)
             currIndex++;
             lastIndex = currIndex;
         }
-        
+
         peekMulti(offsets, sizes, itemCount);
-	}
+    }
 
     // pointerPoke <data to be sent> <first (main) jump> <additional jumps> <final jump in pointerexpr>
     // warning: no validation
     if (!strcmp(argv[0], "pointerPoke"))
-	{
-		if(argc < 4)
+    {
+        if (argc < 4)
             return 0;
-            
-        s64 finalJump = parseStringToSignedLong(argv[argc-1]);
+
+        s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
         u64 count = argc - 3;
-		s64 jumps[count];
-		for (int i = 2; i < argc-1; i++)
-			jumps[i-2] = parseStringToSignedLong(argv[i]);
-		u64 solved = followMainPointer(jumps, count);
+        s64 jumps[count];
+        for (int i = 2; i < argc - 1; i++)
+            jumps[i - 2] = parseStringToSignedLong(argv[i]);
+        u64 solved = followMainPointer(jumps, count);
         solved += finalJump;
 
-		u64 size;
+        u64 size;
         u8* data = parseStringToByteBuffer(argv[1], &size);
         poke(solved, size, data);
         free(data);
-	}
-	
-	// add to freeze map
-	if (!strcmp(argv[0], "freeze"))
+    }
+
+    // add to freeze map
+    if (!strcmp(argv[0], "freeze"))
     {
-        if(argc != 3)
+        if (argc != 3)
             return 0;
-		
-		MetaData meta = getMetaData();
-		
+
+        MetaData meta = getMetaData();
+
         u64 offset = parseStringToInt(argv[1]);
         u64 size = 0;
         u8* data = parseStringToByteBuffer(argv[2], &size);
         addToFreezeMap(offset, data, size, meta.titleID);
     }
-	
-	// remove from freeze map
-	if (!strcmp(argv[0], "unFreeze"))
+
+    // remove from freeze map
+    if (!strcmp(argv[0], "unFreeze"))
     {
-        if(argc != 2)
+        if (argc != 2)
             return 0;
-		
+
         u64 offset = parseStringToInt(argv[1]);
         removeFromFreezeMap(offset);
     }
-	
-	// get count of offsets being frozen
-	if (!strcmp(argv[0], "freezeCount"))
-	{
-		getFreezeCount(true);
-	}
-	
-	// clear all freezes
-	if (!strcmp(argv[0], "freezeClear"))
-	{
-		clearFreezes();
-		freeze_thr_state = Idle;
-	}
+
+    // get count of offsets being frozen
+    if (!strcmp(argv[0], "freezeCount"))
+    {
+        getFreezeCount(true);
+    }
+
+    // clear all freezes
+    if (!strcmp(argv[0], "freezeClear"))
+    {
+        clearFreezes();
+        freeze_thr_state = Idle;
+    }
 
     if (!strcmp(argv[0], "freezePause"))
-		freeze_thr_state = Pause;
+        freeze_thr_state = Pause;
 
     if (!strcmp(argv[0], "freezeUnpause"))
-		freeze_thr_state = Active;
-	
+        freeze_thr_state = Active;
+
     //touch followed by arrayof: <x in the range 0-1280> <y in the range 0-720>. Array is sequential taps, not different fingers. Functions in its own thread, but will not allow the call again while running. tapcount * pollRate * 2
     if (!strcmp(argv[0], "touch"))
-	{
-        if(argc < 3 || argc % 2 == 0)
+    {
+        if (argc < 3 || argc % 2 == 0)
             return 0;
 
-        u32 count = (argc-1)/2;
-		HidTouchState* state = calloc(count, sizeof(HidTouchState));
+        u32 count = (argc - 1) / 2;
+        HidTouchState* state = calloc(count, sizeof(HidTouchState));
         u32 i, j = 0;
         for (i = 0; i < count; ++i)
         {
             state[i].diameter_x = state[i].diameter_y = fingerDiameter;
-            state[i].x = (u32) parseStringToInt(argv[++j]);
-            state[i].y = (u32) parseStringToInt(argv[++j]);
+            state[i].x = (u32)parseStringToInt(argv[++j]);
+            state[i].y = (u32)parseStringToInt(argv[++j]);
         }
 
         makeTouch(state, count, pollRate * 1e+6L, false);
-	}
+    }
 
     //touchHold <x in the range 0-1280> <y in the range 0-720> <time in milliseconds (must be at least 15ms)>. Functions in its own thread, but will not allow the call again while running. pollRate + holdtime
-    if(!strcmp(argv[0], "touchHold")){
-        if(argc != 4)
+    if (!strcmp(argv[0], "touchHold")) {
+        if (argc != 4)
             return 0;
 
         HidTouchState* state = calloc(1, sizeof(HidTouchState));
         state->diameter_x = state->diameter_y = fingerDiameter;
-        state->x = (u32) parseStringToInt(argv[1]);
-        state->y = (u32) parseStringToInt(argv[2]);
+        state->x = (u32)parseStringToInt(argv[1]);
+        state->y = (u32)parseStringToInt(argv[2]);
         u64 time = parseStringToInt(argv[3]);
         makeTouch(state, 1, time * 1e+6L, false);
     }
 
     //touchDraw followed by arrayof: <x in the range 0-1280> <y in the range 0-720>. Array is vectors of where finger moves to, then removes the finger. Functions in its own thread, but will not allow the call again while running. (vectorcount * pollRate * 2) + pollRate
     if (!strcmp(argv[0], "touchDraw"))
-	{
-        if(argc < 3 || argc % 2 == 0)
+    {
+        if (argc < 3 || argc % 2 == 0)
             return 0;
 
-        u32 count = (argc-1)/2;
-		HidTouchState* state = calloc(count, sizeof(HidTouchState));
+        u32 count = (argc - 1) / 2;
+        HidTouchState* state = calloc(count, sizeof(HidTouchState));
         u32 i, j = 0;
         for (i = 0; i < count; ++i)
         {
             state[i].diameter_x = state[i].diameter_y = fingerDiameter;
-            state[i].x = (u32) parseStringToInt(argv[++j]);
-            state[i].y = (u32) parseStringToInt(argv[++j]);
+            state[i].x = (u32)parseStringToInt(argv[++j]);
+            state[i].y = (u32)parseStringToInt(argv[++j]);
         }
 
         makeTouch(state, count, pollRate * 1e+6L * 2, true);
-	}
+    }
 
     if (!strcmp(argv[0], "touchCancel"))
         touchToken = 1;
@@ -765,16 +767,16 @@ int argmain(int argc, char **argv)
     //key followed by arrayof: <HidKeyboardKey> to be pressed in sequential order
     //thank you Red (hp3721) for this functionality
     if (!strcmp(argv[0], "key"))
-	{
+    {
         if (argc < 2)
             return 0;
-        
-        u64 count = argc-1;
-        HiddbgKeyboardAutoPilotState* keystates = calloc(count, sizeof (HiddbgKeyboardAutoPilotState));
+
+        u64 count = argc - 1;
+        HiddbgKeyboardAutoPilotState* keystates = calloc(count, sizeof(HiddbgKeyboardAutoPilotState));
         u64 i;
         for (i = 0; i < count; i++)
         {
-            u8 key = (u8) parseStringToInt(argv[i+1]);
+            u8 key = (u8)parseStringToInt(argv[i + 1]);
             if (key < 4 || key > 231)
                 continue;
             keystates[i].keys[key / 64] = 1UL << key;
@@ -786,20 +788,20 @@ int argmain(int argc, char **argv)
 
     //keyMod followed by arrayof: <HidKeyboardKey> <HidKeyboardModifier>(without the bitfield shift) to be pressed in sequential order
     if (!strcmp(argv[0], "keyMod"))
-	{
+    {
         if (argc < 3 || argc % 2 == 0)
             return 0;
 
-        u32 count = (argc-1)/2;
-        HiddbgKeyboardAutoPilotState* keystates = calloc(count, sizeof (HiddbgKeyboardAutoPilotState));
+        u32 count = (argc - 1) / 2;
+        HiddbgKeyboardAutoPilotState* keystates = calloc(count, sizeof(HiddbgKeyboardAutoPilotState));
         u64 i, j = 0;
         for (i = 0; i < count; i++)
         {
-            u8 key = (u8) parseStringToInt(argv[++j]);
+            u8 key = (u8)parseStringToInt(argv[++j]);
             if (key < 4 || key > 231)
                 continue;
             keystates[i].keys[key / 64] = 1UL << key;
-            keystates[i].modifiers = BIT((u8) parseStringToInt(argv[++j]));
+            keystates[i].modifiers = BIT((u8)parseStringToInt(argv[++j]));
         }
 
         makeKeys(keystates, count);
@@ -807,16 +809,16 @@ int argmain(int argc, char **argv)
 
     //keyMulti followed by arrayof: <HidKeyboardKey> to be pressed at the same time.
     if (!strcmp(argv[0], "keyMulti"))
-	{
+    {
         if (argc < 2)
             return 0;
-        
-        u64 count = argc-1;
-        HiddbgKeyboardAutoPilotState* keystate = calloc(1, sizeof (HiddbgKeyboardAutoPilotState));
+
+        u64 count = argc - 1;
+        HiddbgKeyboardAutoPilotState* keystate = calloc(1, sizeof(HiddbgKeyboardAutoPilotState));
         u64 i;
         for (i = 0; i < count; i++)
         {
-            u8 key = (u8) parseStringToInt(argv[i+1]);
+            u8 key = (u8)parseStringToInt(argv[i + 1]);
             if (key < 4 || key > 231)
                 continue;
             keystate[0].keys[key / 64] |= 1UL << key;
@@ -827,7 +829,7 @@ int argmain(int argc, char **argv)
 
     //turns off the screen (display)
     if (!strcmp(argv[0], "screenOff"))
-	{
+    {
         ViDisplay temp_display;
         Result rc = viOpenDisplay("Internal", &temp_display);
         if (R_FAILED(rc))
@@ -848,7 +850,7 @@ int argmain(int argc, char **argv)
 
     //turns on the screen (display)
     if (!strcmp(argv[0], "screenOn"))
-	{
+    {
         ViDisplay temp_display;
         Result rc = viOpenDisplay("Internal", &temp_display);
         if (R_FAILED(rc))
@@ -866,9 +868,9 @@ int argmain(int argc, char **argv)
             lblExit();
         }
     }
-    
+
     if (!strcmp(argv[0], "charge"))
-	{
+    {
         u32 charge;
         Result rc = psmInitialize();
         if (R_FAILED(rc))
@@ -879,14 +881,14 @@ int argmain(int argc, char **argv)
     }
 
     if (!strcmp(argv[0], "fdCount"))
-	{
+    {
         printf("%d\n", fd_count);
     }
 
     return 0;
 }
 
-void add_to_pfds(struct pollfd *pfds[], int newfd, int *fd_count, int *fd_size)
+void add_to_pfds(struct pollfd* pfds[], int newfd, int* fd_count, int* fd_size)
 {
     if (*fd_count == *fd_size) {
         *fd_size *= 2;
@@ -900,21 +902,21 @@ void add_to_pfds(struct pollfd *pfds[], int newfd, int *fd_count, int *fd_size)
     (*fd_count)++;
 }
 
-void del_from_pfds(struct pollfd pfds[], int i, int *fd_count)
+void del_from_pfds(struct pollfd pfds[], int i, int* fd_count)
 {
-    pfds[i] = pfds[*fd_count-1];
+    pfds[i] = pfds[*fd_count - 1];
 
     (*fd_count)--;
 }
 
 int main()
 {
-    char *linebuf = malloc(sizeof(char) * MAX_LINE_LENGTH);
+    char* linebuf = malloc(sizeof(char) * MAX_LINE_LENGTH);
 
     int c = sizeof(struct sockaddr_in);
     struct sockaddr_in client;
 
-    struct pollfd *pfds = malloc(sizeof *pfds * fd_size);
+    struct pollfd* pfds = malloc(sizeof * pfds * fd_size);
 
     int listenfd = setupServerSocket();
     pfds[0].fd = listenfd;
@@ -922,33 +924,33 @@ int main()
     fd_count = 1;
 
     int newfd;
-	
-	Result rc;
-	int fr_count = 0;
-	
+
+    Result rc;
+    int fr_count = 0;
+
     initFreezes();
 
-	// freeze thread
-	mutexInit(&freezeMutex);
-	rc = threadCreate(&freezeThread, sub_freeze, (void*)&freeze_thr_state, NULL, THREAD_SIZE, 0x2C, -2); 
-	if (R_SUCCEEDED(rc))
+    // freeze thread
+    mutexInit(&freezeMutex);
+    rc = threadCreate(&freezeThread, sub_freeze, (void*)&freeze_thr_state, NULL, THREAD_SIZE, 0x2C, -2);
+    if (R_SUCCEEDED(rc))
         rc = threadStart(&freezeThread);
 
     // touch thread
     mutexInit(&touchMutex);
-    rc = threadCreate(&touchThread, sub_touch, (void*)&currentTouchEvent, NULL, THREAD_SIZE, 0x2C, -2); 
+    rc = threadCreate(&touchThread, sub_touch, (void*)&currentTouchEvent, NULL, THREAD_SIZE, 0x2C, -2);
     if (R_SUCCEEDED(rc))
         rc = threadStart(&touchThread);
 
     // key thread
     mutexInit(&keyMutex);
-    rc = threadCreate(&keyboardThread, sub_key, (void*)&currentKeyEvent, NULL, THREAD_SIZE, 0x2C, -2); 
+    rc = threadCreate(&keyboardThread, sub_key, (void*)&currentKeyEvent, NULL, THREAD_SIZE, 0x2C, -2);
     if (R_SUCCEEDED(rc))
         rc = threadStart(&keyboardThread);
 
     // click sequence thread
     mutexInit(&clickMutex);
-    rc = threadCreate(&clickThread, sub_click, (void*)currentClick, NULL, THREAD_SIZE, 0x2C, -2); 
+    rc = threadCreate(&clickThread, sub_click, (void*)currentClick, NULL, THREAD_SIZE, 0x2C, -2);
     if (R_SUCCEEDED(rc))
         rc = threadStart(&clickThread);
 
@@ -957,18 +959,19 @@ int main()
     while (true)
     {
         poll(pfds, fd_count, -1);
-		mutexLock(&freezeMutex);
-        for(int i = 0; i < fd_count; i++) 
+        mutexLock(&freezeMutex);
+        for (int i = 0; i < fd_count; i++)
         {
-            if (pfds[i].revents & POLLIN) 
+            if (pfds[i].revents & POLLIN)
             {
-                if (pfds[i].fd == listenfd) 
+                if (pfds[i].fd == listenfd)
                 {
-                    newfd = accept(listenfd, (struct sockaddr *)&client, (socklen_t *)&c);
-                    if(newfd != -1)
+                    newfd = accept(listenfd, (struct sockaddr*)&client, (socklen_t*)&c);
+                    if (newfd != -1)
                     {
                         add_to_pfds(&pfds, newfd, &fd_count, &fd_size);
-                    }else{
+                    }
+                    else {
                         svcSleepThread(1e+9L);
                         close(listenfd);
                         listenfd = setupServerSocket();
@@ -981,9 +984,9 @@ int main()
                 {
                     bool readEnd = false;
                     int readBytesSoFar = 0;
-                    while(!readEnd){
+                    while (!readEnd) {
                         int len = recv(pfds[i].fd, &linebuf[readBytesSoFar], 1, 0);
-                        if(len <= 0)
+                        if (len <= 0)
                         {
                             close(pfds[i].fd);
                             del_from_pfds(pfds, i, &fd_count);
@@ -992,7 +995,7 @@ int main()
                         else
                         {
                             readBytesSoFar += len;
-                            if(linebuf[readBytesSoFar-1] == '\n'){
+                            if (linebuf[readBytesSoFar - 1] == '\n') {
                                 readEnd = true;
                                 linebuf[readBytesSoFar - 1] = 0;
 
@@ -1001,8 +1004,8 @@ int main()
 
                                 parseArgs(linebuf, &argmain);
 
-                                if(echoCommands){
-                                    printf("%s\n",linebuf);
+                                if (echoCommands) {
+                                    printf("%s\n", linebuf);
                                 }
                             }
                         }
@@ -1010,17 +1013,17 @@ int main()
                 }
             }
         }
-		fr_count = getFreezeCount(false);
-		if (fr_count == 0)
-			freeze_thr_state = Idle;
-		mutexUnlock(&freezeMutex);
+        fr_count = getFreezeCount(false);
+        if (fr_count == 0)
+            freeze_thr_state = Idle;
+        mutexUnlock(&freezeMutex);
         svcSleepThread(mainLoopSleepTime * 1e+6L);
     }
-	
-	if (R_SUCCEEDED(rc))
+
+    if (R_SUCCEEDED(rc))
     {
-	    freeze_thr_state = Exit;
-		threadWaitForExit(&freezeThread);
+        freeze_thr_state = Exit;
+        threadWaitForExit(&freezeThread);
         threadClose(&freezeThread);
         currentTouchEvent.state = 3;
         threadWaitForExit(&touchThread);
@@ -1030,97 +1033,97 @@ int main()
         threadClose(&keyboardThread);
         clickThreadState = 1;
         threadWaitForExit(&clickThread);
-	}
-	
-	clearFreezes();
+    }
+
+    clearFreezes();
     freeFreezes();
-	
+
     return 0;
 }
 
-void sub_freeze(void *arg)
+void sub_freeze(void* arg)
+{
+    u64 heap_base;
+    u64 tid_now = 0;
+    u64 pid = 0;
+    bool wait_su = false;
+    int freezecount = 0;
+
+IDLE:while (freezecount == 0)
+{
+    if (*(FreezeThreadState*)arg == Exit)
+        break;
+
+    // do nothing
+    svcSleepThread(1e+9L);
+    freezecount = getFreezeCount(false);
+}
+
+while (1)
 {
-	u64 heap_base;
-	u64 tid_now = 0;
-	u64 pid = 0;
-	bool wait_su = false;
-	int freezecount = 0;
-	
-	IDLE:while (freezecount == 0)
-	{
-		if (*(FreezeThreadState*)arg == Exit)
-			break;
-		
-		// do nothing
-		svcSleepThread(1e+9L);
-		freezecount = getFreezeCount(false);
-	}
-	
-	while (1)
-	{
-		if (*(FreezeThreadState*)arg == Exit)
-			break;
-		
-		if (*(FreezeThreadState*)arg == Idle) // no freeze
-		{
-			mutexLock(&freezeMutex);
-			freeze_thr_state = Active;
-			mutexUnlock(&freezeMutex); // stupid but it works so is it really stupid? (yes)
-			freezecount = 0;
-			wait_su = false;
-			goto IDLE;
-		}
-        else if (*(FreezeThreadState*)arg == Pause)
+    if (*(FreezeThreadState*)arg == Exit)
+        break;
+
+    if (*(FreezeThreadState*)arg == Idle) // no freeze
+    {
+        mutexLock(&freezeMutex);
+        freeze_thr_state = Active;
+        mutexUnlock(&freezeMutex); // stupid but it works so is it really stupid? (yes)
+        freezecount = 0;
+        wait_su = false;
+        goto IDLE;
+    }
+    else if (*(FreezeThreadState*)arg == Pause)
+    {
+        svcSleepThread(1e+8L); //1s
+        continue;
+    }
+
+    mutexLock(&freezeMutex);
+    attach();
+    heap_base = getHeapBase(debughandle);
+    pmdmntGetApplicationProcessId(&pid);
+    tid_now = getTitleId(pid);
+    detach();
+
+    // don't freeze on startup of new tid to remove any chance of save corruption
+    if (tid_now == 0)
+    {
+        mutexUnlock(&freezeMutex);
+        svcSleepThread(1e+10L);
+        wait_su = true;
+        continue;
+    }
+
+    if (wait_su)
+    {
+        mutexUnlock(&freezeMutex);
+        svcSleepThread(3e+10L);
+        wait_su = false;
+        mutexLock(&freezeMutex);
+    }
+
+    if (heap_base > 0)
+    {
+        attach();
+        for (int j = 0; j < FREEZE_DIC_LENGTH; j++)
         {
-            svcSleepThread(1e+8L); //1s
-            continue;
+            if (freezes[j].state == 1 && freezes[j].titleId == tid_now)
+            {
+                writeMem(heap_base + freezes[j].address, freezes[j].size, freezes[j].vData);
+            }
         }
-		
-		mutexLock(&freezeMutex);
-		attach();
-		heap_base = getHeapBase(debughandle);
-		pmdmntGetApplicationProcessId(&pid);
-		tid_now = getTitleId(pid);
-		detach();
-		
-		// don't freeze on startup of new tid to remove any chance of save corruption
-		if (tid_now == 0)
-		{
-			mutexUnlock(&freezeMutex);
-			svcSleepThread(1e+10L);
-			wait_su = true;
-			continue;
-		}
-		
-		if (wait_su)
-		{
-			mutexUnlock(&freezeMutex);
-			svcSleepThread(3e+10L);
-			wait_su = false;
-			mutexLock(&freezeMutex);
-		}
-		
-		if (heap_base > 0)
-		{
-			attach();
-			for (int j = 0; j < FREEZE_DIC_LENGTH; j++)
-			{
-				if (freezes[j].state == 1 && freezes[j].titleId == tid_now)
-				{
-					writeMem(heap_base + freezes[j].address, freezes[j].size, freezes[j].vData);
-				}
-			}
-			detach();
-		}
-		
-		mutexUnlock(&freezeMutex);
-		svcSleepThread(freezeRate * 1e+6L);
-		tid_now = 0;
-		pid = 0;
-	}
+        detach();
+    }
+
+    mutexUnlock(&freezeMutex);
+    svcSleepThread(freezeRate * 1e+6L);
+    tid_now = 0;
+    pid = 0;
+}
 }
 
-void sub_touch(void *arg)
+void sub_touch(void* arg)
 {
     while (1)
     {
@@ -1135,7 +1138,7 @@ void sub_touch(void *arg)
         }
 
         svcSleepThread(1e+6L);
-        
+
         touchToken = 0;
 
         if (touchPtr->state == 3)
@@ -1143,14 +1146,14 @@ void sub_touch(void *arg)
     }
 }
 
-void sub_key(void *arg)
+void sub_key(void* arg)
 {
     while (1)
     {
         KeyData* keyPtr = (KeyData*)arg;
         if (keyPtr->state == 1)
         {
-            mutexLock(&keyMutex); 
+            mutexLock(&keyMutex);
             key(keyPtr->states, keyPtr->sequentialCount);
             free(keyPtr->states);
             keyPtr->state = 0;
@@ -1164,7 +1167,7 @@ void sub_key(void *arg)
     }
 }
 
-void sub_click(void *arg)
+void sub_click(void* arg)
 {
     while (1)
     {
diff --git a/sys-botbase/source/util.c b/sys-botbase/source/util.c
index bfbbe9f..7493951 100644
--- a/sys-botbase/source/util.c
+++ b/sys-botbase/source/util.c
@@ -65,7 +65,7 @@ int setupServerSocket()
     server.sin_addr.s_addr = INADDR_ANY;
     server.sin_port = htons(6000);
 
-    while (bind(lissock, (struct sockaddr *)&server, sizeof(server)) < 0)
+    while (bind(lissock, (struct sockaddr*)&server, sizeof(server)) < 0)
     {
         svcSleepThread(1e+9L);
     }
@@ -73,9 +73,9 @@ int setupServerSocket()
     return lissock;
 }
 
-u64 parseStringToInt(char* arg){
-    if(strlen(arg) > 2){
-        if(arg[1] == 'x'){
+u64 parseStringToInt(char* arg) {
+    if (strlen(arg) > 2) {
+        if (arg[1] == 'x') {
             u64 ret = strtoul(arg, NULL, 16);
             return ret;
         }
@@ -84,9 +84,9 @@ u64 parseStringToInt(char* arg){
     return ret;
 }
 
-s64 parseStringToSignedLong(char* arg){
-    if(strlen(arg) > 2){
-        if(arg[1] == 'x' || arg[2] == 'x'){
+s64 parseStringToSignedLong(char* arg) {
+    if (strlen(arg) > 2) {
+        if (arg[1] == 'x' || arg[2] == 'x') {
             s64 ret = strtol(arg, NULL, 16);
             return ret;
         }
@@ -97,12 +97,12 @@ s64 parseStringToSignedLong(char* arg){
 
 u8* parseStringToByteBuffer(char* arg, u64* size)
 {
-    char toTranslate[3] = {0};
+    char toTranslate[3] = { 0 };
     int length = strlen(arg);
     bool isHex = false;
 
-    if(length > 2){
-        if(arg[1] == 'x'){
+    if (length > 2) {
+        if (arg[1] == 'x') {
             isHex = true;
             length -= 2;
             arg = &arg[2]; //cut off 0x
@@ -112,29 +112,32 @@ u8* parseStringToByteBuffer(char* arg, u64* size)
     bool isFirst = true;
     bool isOdd = (length % 2 == 1);
     u64 bufferSize = length / 2;
-    if(isOdd) bufferSize++;
-    u8 *buffer = malloc(bufferSize);
+    if (isOdd) bufferSize++;
+    u8* buffer = malloc(bufferSize);
 
 
 
     u64 i;
-    for (i = 0; i < bufferSize; i++){
-        if(isOdd){
-            if(isFirst){
+    for (i = 0; i < bufferSize; i++) {
+        if (isOdd) {
+            if (isFirst) {
                 toTranslate[0] = '0';
                 toTranslate[1] = arg[i];
-            }else{
+            }
+            else {
                 toTranslate[0] = arg[(2 * i) - 1];
                 toTranslate[1] = arg[(2 * i)];
             }
-        }else{
-            toTranslate[0] = arg[i*2];
-            toTranslate[1] = arg[(i*2) + 1];      
+        }
+        else {
+            toTranslate[0] = arg[i * 2];
+            toTranslate[1] = arg[(i * 2) + 1];
         }
         isFirst = false;
-        if(isHex){
+        if (isHex) {
             buffer[i] = strtoul(toTranslate, NULL, 16);
-        }else{
+        }
+        else {
             buffer[i] = strtoul(toTranslate, NULL, 10);
         }
     }
@@ -147,7 +150,7 @@ HidNpadButton parseStringToButton(char* arg)
     if (strcmp(arg, "A") == 0)
     {
         return HidNpadButton_A;
-    } 
+    }
     else if (strcmp(arg, "B") == 0)
     {
         return HidNpadButton_B;
@@ -228,24 +231,24 @@ HidNpadButton parseStringToButton(char* arg)
     return HidNpadButton_A; //I guess lol
 }
 
-Result capsscCaptureForDebug(void *buffer, size_t buffer_size, u64 *size) {
+Result capsscCaptureForDebug(void* buffer, size_t buffer_size, u64* size) {
     struct {
         u32 a;
         u64 b;
-    } in = {0, 10000000000};
+    } in = { 0, 10000000000 };
     return serviceDispatchInOut(capsscGetServiceSession(), 1204, in, *size,
-        .buffer_attrs = {SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_Out},
+        .buffer_attrs = { SfBufferAttr_HipcMapTransferAllowsNonSecure | SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
         .buffers = { { buffer, buffer_size } },
-    );
+        );
 }
 
 static void sendPatternStatic(const HidsysNotificationLedPattern* pattern, const HidNpadIdType idType)
 {
     s32 total_entries;
-    HidsysUniquePadId unique_pad_ids[2]={0};
+    HidsysUniquePadId unique_pad_ids[2] = { 0 };
 
     Result rc = hidsysGetUniquePadsFromNpad(idType, unique_pad_ids, 2, &total_entries);
-    if (R_FAILED(rc)) 
+    if (R_FAILED(rc))
         return; // probably incompatible or no pads connected
 
     for (int i = 0; i < total_entries; i++)
@@ -260,4 +263,4 @@ void flashLed()
     sendPatternStatic(&breathingpattern, HidNpadIdType_Handheld); // glow in and out x2 for docked joycons
     sendPatternStatic(&flashpattern, HidNpadIdType_No1); // big hard single glow for wireless/wired joycons or controllers
     hidsysExit();
-}
\ No newline at end of file
+}
diff --git a/sys-botbase/source/util.h b/sys-botbase/source/util.h
index e57cfb9..124be54 100644
--- a/sys-botbase/source/util.h
+++ b/sys-botbase/source/util.h
@@ -9,5 +9,5 @@ u64 parseStringToInt(char* arg);
 s64 parseStringToSignedLong(char* arg);
 u8* parseStringToByteBuffer(char* arg, u64* size);
 HidNpadButton parseStringToButton(char* arg);
-Result capsscCaptureForDebug(void *buffer, size_t buffer_size, u64 *size); //big thanks to Behemoth from the Reswitched Discord!
-void flashLed(void);
\ No newline at end of file
+Result capsscCaptureForDebug(void* buffer, size_t buffer_size, u64* size); //big thanks to Behemoth from the Reswitched Discord!
+void flashLed(void);
diff --git a/sys-botbase/sys-botbase.json b/sys-botbase/sys-botbase.json
index cb4bb7a..ef0508a 100644
--- a/sys-botbase/sys-botbase.json
+++ b/sys-botbase/sys-botbase.json
@@ -1,186 +1,186 @@
 {
-	"name": "sys-botbase",
-	"program_id": "0x430000000000000B",
-	"program_id_range_min": "0x430000000000000B",
-	"program_id_range_max": "0x430000000000000B",
-	"version": "0",
-	"optimize_memory_allocation": false,
-	"enable_alias_region_extra_size": false,
-	"prevent_code_reads": false,
-	"signature_key_generation": 0,
-	"main_thread_stack_size": "0x00024000",
-	"main_thread_priority": 42,
-	"default_cpu_id": 3,
-	"process_category" : 0,
-	"is_retail": true,
-	"pool_partition": 2,
-	"is_64_bit": true,
-	"address_space_type": 3,
-	"system_resource_size": "0",
-	"disable_device_address_space_merge": true,
-	"filesystem_access": {
-		"permissions": "0xffffffffffffffff"
-	},
-	"service_access": [ "*" ],
-	"service_host": [ "*" ],
-	"kernel_capabilities": [
-		{
-			"type": "kernel_flags",
-			"value": {
-				"highest_thread_priority": 63,
-				"lowest_thread_priority": 24,
-				"lowest_cpu_id": 3,
-				"highest_cpu_id": 3
-			}
-		},
-		{
-			"type": "syscalls",
-			"value": {
-				"svcUnknown": "0x00",
-				"svcSetHeapSize": "0x01",
-				"svcSetMemoryPermission": "0x02",
-				"svcSetMemoryAttribute": "0x03",
-				"svcMapMemory": "0x04",
-				"svcUnmapMemory": "0x05",
-				"svcQueryMemory": "0x06",
-				"svcExitProcess": "0x07",
-				"svcCreateThread": "0x08",
-				"svcStartThread": "0x09",
-				"svcExitThread": "0x0a",
-				"svcSleepThread": "0x0b",
-				"svcGetThreadPriority": "0x0c",
-				"svcSetThreadPriority": "0x0d",
-				"svcGetThreadCoreMask": "0x0e",
-				"svcSetThreadCoreMask": "0x0f",
-				"svcGetCurrentProcessorNumber": "0x10",
-				"svcSignalEvent": "0x11",
-				"svcClearEvent": "0x12",
-				"svcMapSharedMemory": "0x13",
-				"svcUnmapSharedMemory": "0x14",
-				"svcCreateTransferMemory": "0x15",
-				"svcCloseHandle": "0x16",
-				"svcResetSignal": "0x17",
-				"svcWaitSynchronization": "0x18",
-				"svcCancelSynchronization": "0x19",
-				"svcArbitrateLock": "0x1a",
-				"svcArbitrateUnlock": "0x1b",
-				"svcWaitProcessWideKeyAtomic": "0x1c",
-				"svcSignalProcessWideKey": "0x1d",
-				"svcGetSystemTick": "0x1e",
-				"svcConnectToNamedPort": "0x1f",
-				"svcSendSyncRequestLight": "0x20",
-				"svcSendSyncRequest": "0x21",
-				"svcSendSyncRequestWithUserBuffer": "0x22",
-				"svcSendAsyncRequestWithUserBuffer": "0x23",
-				"svcGetProcessId": "0x24",
-				"svcGetThreadId": "0x25",
-				"svcBreak": "0x26",
-				"svcOutputDebugString": "0x27",
-				"svcReturnFromException": "0x28",
-				"svcGetInfo": "0x29",
-				"svcFlushEntireDataCache": "0x2a",
-				"svcFlushDataCache": "0x2b",
-				"svcMapPhysicalMemory": "0x2c",
-				"svcUnmapPhysicalMemory": "0x2d",
-				"svcGetFutureThreadInfo": "0x2e",
-				"svcGetLastThreadInfo": "0x2f",
-				"svcGetResourceLimitLimitValue": "0x30",
-				"svcGetResourceLimitCurrentValue": "0x31",
-				"svcSetThreadActivity": "0x32",
-				"svcGetThreadContext3": "0x33",
-				"svcWaitForAddress": "0x34",
-				"svcSignalToAddress": "0x35",
-				"svcUnknown": "0x36",
-				"svcUnknown": "0x37",
-				"svcUnknown": "0x38",
-				"svcUnknown": "0x39",
-				"svcUnknown": "0x3a",
-				"svcUnknown": "0x3b",
-				"svcDumpInfo": "0x3c",
-				"svcDumpInfoNew": "0x3d",
-				"svcUnknown": "0x3e",
-				"svcUnknown": "0x3f",
-				"svcCreateSession": "0x40",
-				"svcAcceptSession": "0x41",
-				"svcReplyAndReceiveLight": "0x42",
-				"svcReplyAndReceive": "0x43",
-				"svcReplyAndReceiveWithUserBuffer": "0x44",
-				"svcCreateEvent": "0x45",
-				"svcUnknown": "0x46",
-				"svcUnknown": "0x47",
-				"svcMapPhysicalMemoryUnsafe": "0x48",
-				"svcUnmapPhysicalMemoryUnsafe": "0x49",
-				"svcSetUnsafeLimit": "0x4a",
-				"svcCreateCodeMemory": "0x4b",
-				"svcControlCodeMemory": "0x4c",
-				"svcSleepSystem": "0x4d",
-				"svcReadWriteRegister": "0x4e",
-				"svcSetProcessActivity": "0x4f",
-				"svcCreateSharedMemory": "0x50",
-				"svcMapTransferMemory": "0x51",
-				"svcUnmapTransferMemory": "0x52",
-				"svcCreateInterruptEvent": "0x53",
-				"svcQueryPhysicalAddress": "0x54",
-				"svcQueryIoMapping": "0x55",
-				"svcCreateDeviceAddressSpace": "0x56",
-				"svcAttachDeviceAddressSpace": "0x57",
-				"svcDetachDeviceAddressSpace": "0x58",
-				"svcMapDeviceAddressSpaceByForce": "0x59",
-				"svcMapDeviceAddressSpaceAligned": "0x5a",
-				"svcMapDeviceAddressSpace": "0x5b",
-				"svcUnmapDeviceAddressSpace": "0x5c",
-				"svcInvalidateProcessDataCache": "0x5d",
-				"svcStoreProcessDataCache": "0x5e",
-				"svcFlushProcessDataCache": "0x5f",
-				"svcDebugActiveProcess": "0x60",
-				"svcBreakDebugProcess": "0x61",
-				"svcTerminateDebugProcess": "0x62",
-				"svcGetDebugEvent": "0x63",
-				"svcContinueDebugEvent": "0x64",
-				"svcGetProcessList": "0x65",
-				"svcGetThreadList": "0x66",
-				"svcGetDebugThreadContext": "0x67",
-				"svcSetDebugThreadContext": "0x68",
-				"svcQueryDebugProcessMemory": "0x69",
-				"svcReadDebugProcessMemory": "0x6a",
-				"svcWriteDebugProcessMemory": "0x6b",
-				"svcSetHardwareBreakPoint": "0x6c",
-				"svcGetDebugThreadParam": "0x6d",
-				"svcUnknown": "0x6e",
-				"svcGetSystemInfo": "0x6f",
-				"svcCreatePort": "0x70",
-				"svcManageNamedPort": "0x71",
-				"svcConnectToPort": "0x72",
-				"svcSetProcessMemoryPermission": "0x73",
-				"svcMapProcessMemory": "0x74",
-				"svcUnmapProcessMemory": "0x75",
-				"svcQueryProcessMemory": "0x76",
-				"svcMapProcessCodeMemory": "0x77",
-				"svcUnmapProcessCodeMemory": "0x78",
-				"svcCreateProcess": "0x79",
-				"svcStartProcess": "0x7a",
-				"svcTerminateProcess": "0x7b",
-				"svcGetProcessInfo": "0x7c",
-				"svcCreateResourceLimit": "0x7d",
-				"svcSetResourceLimitLimitValue": "0x7e",
-				"svcCallSecureMonitor": "0x7f"
-			}
-		},
-		{
-			"type": "min_kernel_version",
-			"value": "0x0060"
-		},
-		{
-			"type": "handle_table_size",
-			"value": 1023
-		},
-		{
-			"type": "debug_flags",
-			"value": {
-				"allow_debug": false,
-				"force_debug": true,
-				"force_debug_prod": false
-			}
-		}
-	]
+    "name": "sys-botbase",
+    "program_id": "0x430000000000000B",
+    "program_id_range_min": "0x430000000000000B",
+    "program_id_range_max": "0x430000000000000B",
+    "version": "0",
+    "optimize_memory_allocation": false,
+    "enable_alias_region_extra_size": false,
+    "prevent_code_reads": false,
+    "signature_key_generation": 0,
+    "main_thread_stack_size": "0x00024000",
+    "main_thread_priority": 42,
+    "default_cpu_id": 3,
+    "process_category" : 0,
+    "is_retail": true,
+    "pool_partition": 2,
+    "is_64_bit": true,
+    "address_space_type": 3,
+    "system_resource_size": "0",
+    "disable_device_address_space_merge": true,
+    "filesystem_access": {
+        "permissions": "0xffffffffffffffff"
+    },
+    "service_access": [ "*" ],
+    "service_host": [ "*" ],
+    "kernel_capabilities": [
+        {
+            "type": "kernel_flags",
+            "value": {
+                "highest_thread_priority": 63,
+                "lowest_thread_priority": 24,
+                "lowest_cpu_id": 3,
+                "highest_cpu_id": 3
+            }
+        },
+        {
+            "type": "syscalls",
+            "value": {
+                "svcUnknown": "0x00",
+                "svcSetHeapSize": "0x01",
+                "svcSetMemoryPermission": "0x02",
+                "svcSetMemoryAttribute": "0x03",
+                "svcMapMemory": "0x04",
+                "svcUnmapMemory": "0x05",
+                "svcQueryMemory": "0x06",
+                "svcExitProcess": "0x07",
+                "svcCreateThread": "0x08",
+                "svcStartThread": "0x09",
+                "svcExitThread": "0x0a",
+                "svcSleepThread": "0x0b",
+                "svcGetThreadPriority": "0x0c",
+                "svcSetThreadPriority": "0x0d",
+                "svcGetThreadCoreMask": "0x0e",
+                "svcSetThreadCoreMask": "0x0f",
+                "svcGetCurrentProcessorNumber": "0x10",
+                "svcSignalEvent": "0x11",
+                "svcClearEvent": "0x12",
+                "svcMapSharedMemory": "0x13",
+                "svcUnmapSharedMemory": "0x14",
+                "svcCreateTransferMemory": "0x15",
+                "svcCloseHandle": "0x16",
+                "svcResetSignal": "0x17",
+                "svcWaitSynchronization": "0x18",
+                "svcCancelSynchronization": "0x19",
+                "svcArbitrateLock": "0x1a",
+                "svcArbitrateUnlock": "0x1b",
+                "svcWaitProcessWideKeyAtomic": "0x1c",
+                "svcSignalProcessWideKey": "0x1d",
+                "svcGetSystemTick": "0x1e",
+                "svcConnectToNamedPort": "0x1f",
+                "svcSendSyncRequestLight": "0x20",
+                "svcSendSyncRequest": "0x21",
+                "svcSendSyncRequestWithUserBuffer": "0x22",
+                "svcSendAsyncRequestWithUserBuffer": "0x23",
+                "svcGetProcessId": "0x24",
+                "svcGetThreadId": "0x25",
+                "svcBreak": "0x26",
+                "svcOutputDebugString": "0x27",
+                "svcReturnFromException": "0x28",
+                "svcGetInfo": "0x29",
+                "svcFlushEntireDataCache": "0x2a",
+                "svcFlushDataCache": "0x2b",
+                "svcMapPhysicalMemory": "0x2c",
+                "svcUnmapPhysicalMemory": "0x2d",
+                "svcGetFutureThreadInfo": "0x2e",
+                "svcGetLastThreadInfo": "0x2f",
+                "svcGetResourceLimitLimitValue": "0x30",
+                "svcGetResourceLimitCurrentValue": "0x31",
+                "svcSetThreadActivity": "0x32",
+                "svcGetThreadContext3": "0x33",
+                "svcWaitForAddress": "0x34",
+                "svcSignalToAddress": "0x35",
+                "svcUnknown": "0x36",
+                "svcUnknown": "0x37",
+                "svcUnknown": "0x38",
+                "svcUnknown": "0x39",
+                "svcUnknown": "0x3a",
+                "svcUnknown": "0x3b",
+                "svcDumpInfo": "0x3c",
+                "svcDumpInfoNew": "0x3d",
+                "svcUnknown": "0x3e",
+                "svcUnknown": "0x3f",
+                "svcCreateSession": "0x40",
+                "svcAcceptSession": "0x41",
+                "svcReplyAndReceiveLight": "0x42",
+                "svcReplyAndReceive": "0x43",
+                "svcReplyAndReceiveWithUserBuffer": "0x44",
+                "svcCreateEvent": "0x45",
+                "svcUnknown": "0x46",
+                "svcUnknown": "0x47",
+                "svcMapPhysicalMemoryUnsafe": "0x48",
+                "svcUnmapPhysicalMemoryUnsafe": "0x49",
+                "svcSetUnsafeLimit": "0x4a",
+                "svcCreateCodeMemory": "0x4b",
+                "svcControlCodeMemory": "0x4c",
+                "svcSleepSystem": "0x4d",
+                "svcReadWriteRegister": "0x4e",
+                "svcSetProcessActivity": "0x4f",
+                "svcCreateSharedMemory": "0x50",
+                "svcMapTransferMemory": "0x51",
+                "svcUnmapTransferMemory": "0x52",
+                "svcCreateInterruptEvent": "0x53",
+                "svcQueryPhysicalAddress": "0x54",
+                "svcQueryIoMapping": "0x55",
+                "svcCreateDeviceAddressSpace": "0x56",
+                "svcAttachDeviceAddressSpace": "0x57",
+                "svcDetachDeviceAddressSpace": "0x58",
+                "svcMapDeviceAddressSpaceByForce": "0x59",
+                "svcMapDeviceAddressSpaceAligned": "0x5a",
+                "svcMapDeviceAddressSpace": "0x5b",
+                "svcUnmapDeviceAddressSpace": "0x5c",
+                "svcInvalidateProcessDataCache": "0x5d",
+                "svcStoreProcessDataCache": "0x5e",
+                "svcFlushProcessDataCache": "0x5f",
+                "svcDebugActiveProcess": "0x60",
+                "svcBreakDebugProcess": "0x61",
+                "svcTerminateDebugProcess": "0x62",
+                "svcGetDebugEvent": "0x63",
+                "svcContinueDebugEvent": "0x64",
+                "svcGetProcessList": "0x65",
+                "svcGetThreadList": "0x66",
+                "svcGetDebugThreadContext": "0x67",
+                "svcSetDebugThreadContext": "0x68",
+                "svcQueryDebugProcessMemory": "0x69",
+                "svcReadDebugProcessMemory": "0x6a",
+                "svcWriteDebugProcessMemory": "0x6b",
+                "svcSetHardwareBreakPoint": "0x6c",
+                "svcGetDebugThreadParam": "0x6d",
+                "svcUnknown": "0x6e",
+                "svcGetSystemInfo": "0x6f",
+                "svcCreatePort": "0x70",
+                "svcManageNamedPort": "0x71",
+                "svcConnectToPort": "0x72",
+                "svcSetProcessMemoryPermission": "0x73",
+                "svcMapProcessMemory": "0x74",
+                "svcUnmapProcessMemory": "0x75",
+                "svcQueryProcessMemory": "0x76",
+                "svcMapProcessCodeMemory": "0x77",
+                "svcUnmapProcessCodeMemory": "0x78",
+                "svcCreateProcess": "0x79",
+                "svcStartProcess": "0x7a",
+                "svcTerminateProcess": "0x7b",
+                "svcGetProcessInfo": "0x7c",
+                "svcCreateResourceLimit": "0x7d",
+                "svcSetResourceLimitLimitValue": "0x7e",
+                "svcCallSecureMonitor": "0x7f"
+            }
+        },
+        {
+            "type": "min_kernel_version",
+            "value": "0x0060"
+        },
+        {
+            "type": "handle_table_size",
+            "value": 1023
+        },
+        {
+            "type": "debug_flags",
+            "value": {
+                "allow_debug": false,
+                "force_debug": true,
+                "force_debug_prod": false
+            }
+        }
+    ]
 }

From ea491dcafe3e52ca6e7a9659e387a51ebdca8668 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Sat, 7 Feb 2026 01:02:06 -0600
Subject: [PATCH 04/13] Add editorconfig to standardize formatting

---
 .editorconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..7eea5c9
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# All Files
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+tab_width = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Makefile
+[Makefile]
+indent_style = tab

From 31367da2ba8ba3b34cc3c87effcb2b5878f9f8c6 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Sun, 8 Feb 2026 10:55:45 -0600
Subject: [PATCH 05/13] Print '\n' for failed reads

---
 sys-botbase/source/commands.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index d92112f..f32b6fc 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -248,6 +248,7 @@ void peek(u64 offset, u64 size)
     Result rc = readMem(out, offset, size);
     if (R_FAILED(rc))
     {
+        printf("\n");
         detach();
         free(out);
         return;
@@ -278,6 +279,7 @@ void peekInfinite(u64 offset, u64 size)
         Result rc = readMem(out, offset + totalFetched, thisBuffersize);
         if (R_FAILED(rc))
         {
+            printf("\n");
             detach();
             free(out);
             return;
@@ -309,6 +311,7 @@ void peekMulti(u64* offset, u64* size, u64 count)
         Result rc = readMem(out + ofs, offset[i], size[i]);
         if (R_FAILED(rc))
         {
+            printf("\n");
             detach();
             free(out);
             return;

From dd821e48536ca2549d35e3d87022fe5464c4f854 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Tue, 10 Feb 2026 00:35:03 -0600
Subject: [PATCH 06/13] Ensure failed pointer read returns 0

---
 sys-botbase/source/commands.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index f32b6fc..b0a998b 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -414,7 +414,11 @@ u64 followMainPointer(s64* jumps, size_t count)
     {
         rc = readMem(out, offset + jumps[i], size);
         if (R_FAILED(rc))
-            break;
+        {
+            detach();
+            free(out);
+            return 0;
+        }
         offset = *(u64*)out;
         // This traversal resulted in an error
         if (offset == 0)
@@ -422,7 +426,6 @@ u64 followMainPointer(s64* jumps, size_t count)
     }
     detach();
     free(out);
-
     return offset;
 }
 

From 523cd11d6e62f37c9bd074fbd711bb5b2fb98708 Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Mon, 18 May 2026 11:48:06 -0500
Subject: [PATCH 07/13] Handle potential failed getMetaData (#108)

---
 sys-botbase/source/commands.c | 41 +++++++++++++++++----
 sys-botbase/source/main.c     | 69 +++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index b0a998b..c5a4339 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -52,8 +52,11 @@ u64 getMainNsoBase(u64 pid) {
     LoaderModuleInfo proc_modules[2];
     s32 numModules = 0;
     Result rc = ldrDmntGetProcessModuleInfo(pid, proc_modules, 2, &numModules);
-    if (R_FAILED(rc) && debugResultCodes)
-        printf("ldrDmntGetProcessModuleInfo: %d\n", rc);
+    if (R_FAILED(rc)) {
+        if (debugResultCodes)
+            printf("ldrDmntGetProcessModuleInfo: %d\n", rc);
+        return 0;
+    }
 
     LoaderModuleInfo* proc_module = 0;
     if (numModules == 2) {
@@ -91,6 +94,12 @@ u64 GetTitleVersion(u64 pid) {
         fatalThrow(rc);
 
     NsApplicationContentMetaStatus* MetaStatus = malloc(sizeof(NsApplicationContentMetaStatus[100U]));
+    if (MetaStatus == NULL) {
+        // Handle allocation failure
+        printf("Failed to allocate memory for MetaStatus\n");
+        nsExit();
+        return 0; // or another appropriate error value
+    }
     rc = nsListApplicationContentMetaStatus(getTitleId(pid), 0, MetaStatus, 100, &out);
     if (R_FAILED(rc) && debugResultCodes)
         printf("nsListApplicationContentMetaStatus: %d\n", rc);
@@ -118,12 +127,17 @@ u64 getoutsize(NsApplicationControlData* buf) {
     nsExit();
     return outsize;
 }
+
 void getBuildID(MetaData* meta, u64 pid) {
     LoaderModuleInfo proc_modules[2];
     s32 numModules = 0;
     Result rc = ldrDmntGetProcessModuleInfo(pid, proc_modules, 2, &numModules);
-    if (R_FAILED(rc) && debugResultCodes)
-        printf("ldrDmntGetProcessModuleInfo: %d\n", rc);
+    if (R_FAILED(rc)) {
+        if (debugResultCodes)
+            printf("ldrDmntGetProcessModuleInfo: %d\n", rc);
+        memset(meta->buildID, 0, 0x20);
+        return;
+    }
 
     LoaderModuleInfo* proc_module = 0;
     if (numModules == 2) {
@@ -140,8 +154,13 @@ MetaData getMetaData() {
     attach();
     u64 pid = 0;
     Result rc = pmdmntGetApplicationProcessId(&pid);
-    if (R_FAILED(rc) && debugResultCodes)
-        printf("pmdmntGetApplicationProcessId: %d\n", rc);
+    if (R_FAILED(rc)) {
+        if (debugResultCodes)
+            printf("pmdmntGetApplicationProcessId: %d\n", rc);
+        detach();
+        memset(&meta, 0, sizeof(meta));
+        return meta;
+    }
 
     meta.main_nso_base = getMainNsoBase(pid);
     meta.heap_base = getHeapBase(debughandle);
@@ -244,6 +263,10 @@ void writeMem(u64 offset, u64 size, u8* val)
 void peek(u64 offset, u64 size)
 {
     u8* out = malloc(sizeof(u8) * size);
+    if (out == NULL) {
+        printf("\n");
+        return;
+    }
     attach();
     Result rc = readMem(out, offset, size);
     if (R_FAILED(rc))
@@ -270,6 +293,10 @@ void peekInfinite(u64 offset, u64 size)
     u64 totalFetched = 0;
     u64 i;
     u8* out = malloc(sizeof(u8) * MAX_LINE_LENGTH);
+    if (out == NULL) {
+        printf("\n");
+        return;
+    }
 
     attach();
     while (sizeRemainder > 0)
@@ -292,8 +319,8 @@ void peekInfinite(u64 offset, u64 size)
 
         totalFetched += thisBuffersize;
     }
-    detach();
     printf("\n");
+    detach();
     free(out);
 }
 
diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index ed50b80..85342a6 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -162,6 +162,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
@@ -174,6 +179,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 itemCount = (argc - 1) / 2;
         u64 offsets[itemCount];
@@ -220,6 +230,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
@@ -232,6 +247,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 itemCount = (argc - 1) / 2;
         u64 offsets[itemCount];
@@ -252,6 +272,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 offset = parseStringToInt(argv[1]);
         u64 size = 0;
@@ -278,6 +303,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 offset = parseStringToInt(argv[1]);
         u64 size = 0;
@@ -304,6 +334,10 @@ int argmain(int argc, char** argv)
 
         u64 sizeArg = strlen(argv[1]) + 1;
         char* seqNew = malloc(sizeArg);
+        if (seqNew == NULL) {
+            printf("\n");
+            return 0;
+        }
         strcpy(seqNew, argv[1]);
         makeClickSeq(seqNew);
     }
@@ -461,11 +495,21 @@ int argmain(int argc, char** argv)
 
     if (!strcmp(argv[0], "getTitleID")) {
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
         printf("%016lX\n", meta.titleID);
     }
 
     if (!strcmp(argv[0], "getTitleVersion")) {
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
         printf("%016lX\n", meta.titleVersion);
     }
 
@@ -481,17 +525,32 @@ int argmain(int argc, char** argv)
 
     if (!strcmp(argv[0], "getMainNsoBase")) {
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
         printf("%016lX\n", meta.main_nso_base);
     }
 
     if (!strcmp(argv[0], "getBuildID")) {
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
         printf("%02x%02x%02x%02x%02x%02x%02x%02x\n", meta.buildID[0], meta.buildID[1], meta.buildID[2], meta.buildID[3], meta.buildID[4], meta.buildID[5], meta.buildID[6], meta.buildID[7]);
 
     }
 
     if (!strcmp(argv[0], "getHeapBase")) {
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
         printf("%016lX\n", meta.heap_base);
     }
 
@@ -574,6 +633,11 @@ int argmain(int argc, char** argv)
         {
             solved += finalJump;
             MetaData meta = getMetaData();
+            if (meta.main_nso_base == 0)
+            {
+                printf("\n");
+                return 0;
+            }
             solved -= meta.heap_base;
         }
         printf("%016lX\n", solved);
@@ -674,6 +738,11 @@ int argmain(int argc, char** argv)
             return 0;
 
         MetaData meta = getMetaData();
+        if (meta.main_nso_base == 0)
+        {
+            printf("\n");
+            return 0;
+        }
 
         u64 offset = parseStringToInt(argv[1]);
         u64 size = 0;

From 45b6a6419624ed1a1f34aabc9f37336d5f130e61 Mon Sep 17 00:00:00 2001
From: "DESKTOP-SN9KF5O\\Strawberry" <berichandev@gmail.com>
Date: Sat, 23 May 2026 23:38:38 +0100
Subject: [PATCH 08/13] Bump version to 2.5

---
 sys-botbase/source/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index 85342a6..92e6283 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -17,7 +17,7 @@
 #define TITLE_ID 0x430000000000000B
 #define HEAP_SIZE 0x00480000
 #define THREAD_SIZE 0x1A000
-#define VERSION_S "2.41"
+#define VERSION_S "2.5"
 
 typedef enum {
     Active = 0,

From ae13548c587b75abf54f32032ad8d52f51eda05e Mon Sep 17 00:00:00 2001
From: Lusamine <30205550+Lusamine@users.noreply.github.com>
Date: Mon, 1 Jun 2026 21:42:41 -0500
Subject: [PATCH 09/13] Missed a metadata check (#109)

---
 sys-botbase/source/commands.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index c5a4339..d443bd4 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -425,6 +425,8 @@ u64 followMainPointer(s64* jumps, size_t count)
     u64 size = sizeof offset;
     u8* out = malloc(size);
     MetaData meta = getMetaData();
+    if (meta.main_nso_base == 0)
+        return 0;
 
     attach();
     Result rc = readMem(out, meta.main_nso_base + jumps[0], size);

From 0e04a14ac80837e7e07f28ba7af1cd5e64b0fbad Mon Sep 17 00:00:00 2001
From: Koi <koi.github3088@gmail.com>
Date: Sun, 10 Apr 2022 00:02:06 -0500
Subject: [PATCH 10/13] - Re-add fs and sdmc init, check configuration early
 on. - Remove NTP. - Remove dependency from Atmosphere-libs. - Update to
 Berichan's sbb 2.0's functions. - Allow switching between WiFi and USB via a
 "config.cfg" file, if desired. - Support all sbb functions (multi peek,
 pointer read, etc) in USB mode. - Implement Berichan's commits for FW 13.0.0
 support (edaf53dc) and pointers relative to heap (0bcb7c70). - Minor clean of
 sorts. - Combine sys-botbase and usb-botbase in an extremely cheesy and hacky
 way. Alpha commit. - Add Luxray-like network time advancing and resetting.

---
 sys-botbase/source/commands.c |  78 +++++-
 sys-botbase/source/commands.h |   5 +
 sys-botbase/source/main.c     | 477 ++++++++++++++++++++++++++++------
 3 files changed, 477 insertions(+), 83 deletions(-)

diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index d443bd4..f279e22 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -14,6 +14,8 @@ HidDeviceType controllerInitializedType = HidDeviceType_FullKey3;
 HiddbgHdlsHandle controllerHandle = { 0 };
 HiddbgHdlsDeviceInfo controllerDevice = { 0 };
 HiddbgHdlsState controllerState = { 0 };
+time_t curTime = 0;
+time_t origTime = 0;
 
 //Keyboard:
 HiddbgKeyboardAutoPilotState dummyKeyboardState = { 0 };
@@ -277,11 +279,15 @@ void peek(u64 offset, u64 size)
         return;
     }
 
-    u64 i;
-    for (i = 0; i < size; i++)
+    if (!usb)
     {
-        printf("%02X", out[i]);
+        u64 i;
+        for (i = 0; i < size; i++)
+        {
+            printf("%02X", out[i]);
+        }
     }
+
     printf("\n");
     detach();
     free(out);
@@ -312,10 +318,13 @@ void peekInfinite(u64 offset, u64 size)
             return;
         }
 
-        for (i = 0; i < thisBuffersize; i++)
-        {
-            printf("%02X", out[i]);
-        }
+		if (!usb)
+		{
+            for (i = 0; i < thisBuffersize; i++)
+            {
+                printf("%02X", out[i]);
+            }
+		}
 
         totalFetched += thisBuffersize;
     }
@@ -346,10 +355,13 @@ void peekMulti(u64* offset, u64* size, u64 count)
         ofs += size[i];
     }
 
-    u64 i;
-    for (i = 0; i < totalSize; i++)
+    if (!usb)
     {
-        printf("%02X", out[i]);
+        u64 i;
+        for (i = 0; i < totalSize; i++)
+        {
+            printf("%02X", out[i]);
+        }
     }
     printf("\n");
     detach();
@@ -591,3 +603,49 @@ void clickSequence(char* seq, u8* token)
         command = strtok(NULL, &delim);
     }
 }
+
+void dateSkip()
+{
+    if (origTime == 0)
+    {
+        Result ot = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&origTime);
+        if (R_FAILED(ot))
+            fatalThrow(ot);
+    }
+
+    Result tg = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&curTime); //Current system time
+    if (R_FAILED(tg))
+        fatalThrow(tg);
+
+    Result ts = timeSetCurrentTime(TimeType_NetworkSystemClock, (uint64_t)(curTime + 86400)); //Set new time
+    if (R_FAILED(ts))
+        fatalThrow(ts);
+}
+
+void resetTime()
+{
+    if (curTime == 0)
+    {
+        Result ct = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&curTime); //Current system time
+        if (R_FAILED(ct))
+            fatalThrow(ct);
+    }
+
+    if (origTime == 0)
+    {
+        Result ct = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&origTime);
+        if (R_FAILED(ct))
+            fatalThrow(ct);
+    }
+
+    struct tm currentTime = *localtime(&curTime);
+    struct tm timeReset = *localtime(&origTime);
+    timeReset.tm_hour = currentTime.tm_hour;
+    timeReset.tm_min = currentTime.tm_min;
+    timeReset.tm_sec = currentTime.tm_sec;
+    Result rt = timeSetCurrentTime(TimeType_NetworkSystemClock, mktime(&timeReset));
+    curTime = 0;
+    origTime = 0;
+    if (R_FAILED(rt))
+        fatalThrow(rt);
+}
diff --git a/sys-botbase/source/commands.h b/sys-botbase/source/commands.h
index 293b5fa..2142fe6 100644
--- a/sys-botbase/source/commands.h
+++ b/sys-botbase/source/commands.h
@@ -1,4 +1,6 @@
 #include <switch.h>
+#include <time.h>
+#define TOUCHPOLLMIN 15000000L // touch screen polling rate seems to be 15ms (no idea how to change)
 
 extern Handle debughandle;
 extern bool bControllerIsInitialised;
@@ -11,6 +13,7 @@ extern u64 buttonClickSleepTime;
 extern u64 keyPressSleepTime;
 extern u64 pollRate;
 extern u32 fingerDiameter;
+extern bool usb;
 
 typedef struct {
     u64 main_nso_base;
@@ -64,3 +67,5 @@ u64 followMainPointer(s64* jumps, size_t count);
 void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold, u8* token);
 void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount);
 void clickSequence(char* seq, u8* token);
+void dateSkip();
+void resetTime();
diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index 92e6283..f78cb65 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -13,12 +13,19 @@
 #include "util.h"
 #include "freeze.h"
 #include <poll.h>
+#include "time.h"
 
 #define TITLE_ID 0x430000000000000B
 #define HEAP_SIZE 0x00480000
 #define THREAD_SIZE 0x1A000
 #define VERSION_S "2.5"
 
+typedef struct
+{
+    u64 size;
+    void* data;
+}USBResponse;
+
 typedef enum {
     Active = 0,
     Exit = 1,
@@ -33,6 +40,9 @@ void sub_freeze(void* arg);
 void sub_touch(void* arg);
 void sub_key(void* arg);
 void sub_click(void* arg);
+void usbMainLoop();
+void wifiMainLoop();
+bool isUSB();
 
 // locks for thread
 Mutex freezeMutex, touchMutex, keyMutex, clickMutex;
@@ -44,6 +54,7 @@ u8 clickThreadState = 0; // 1 = break thread
 KeyData currentKeyEvent = { 0 };
 TouchData currentTouchEvent = { 0 };
 char* currentClick = NULL;
+bool usb = true;
 
 // for cancelling the touch/click thread
 u8 touchToken = 0;
@@ -55,6 +66,14 @@ int fd_size = 5;
 
 // we aren't an applet
 u32 __nx_applet_type = AppletType_None;
+TimeServiceType __nx_time_service_type = TimeServiceType_System;
+
+void sendUsbResponse(USBResponse response)
+{
+    usbCommsWrite((void*)&response, 4);
+    if (response.size > 0)
+        usbCommsWrite(response.data, response.size);
+}
 
 // we override libnx internals to do a minimal init
 void __libnx_initheap(void)
@@ -85,6 +104,15 @@ void __appInit(void)
             setsysExit();
         }
     }
+    rc = timeInitialize();
+    if (R_FAILED(rc))
+    {
+        timeExit();
+        __nx_time_service_type = TimeServiceType_User;
+        rc = timeInitialize();
+        if(R_FAILED(rc))
+            fatalThrow(rc);
+    }
     rc = pmdmntInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
@@ -92,11 +120,29 @@ void __appInit(void)
     if (R_FAILED(rc))
         fatalThrow(rc);
     rc = pminfoInitialize();
+	if (R_FAILED(rc)) 
+		fatalThrow(rc);
+    rc = fsInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
-    rc = socketInitializeDefault();
+    rc = fsdevMountSdmc();
     if (R_FAILED(rc))
         fatalThrow(rc);
+
+    usb = isUSB();
+    if (usb)
+    {
+        rc = usbCommsInitialize();
+        if (R_FAILED(rc))
+            fatalThrow(rc);
+    }
+    else
+    {
+        rc = socketInitializeDefault();
+        if (R_FAILED(rc))
+            fatalThrow(rc);
+    }
+
     rc = capsscInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
@@ -107,17 +153,21 @@ void __appInit(void)
 
 void __appExit(void)
 {
+    fsdevUnmountAll();
+    fsExit();
     smExit();
     nsExit();
     audoutExit();
-    socketExit();
+    timeExit();
     viExit();
+    if (usb)
+        usbCommsExit();
+    else socketExit();
 }
 
 u64 mainLoopSleepTime = 50;
 u64 freezeRate = 3;
 bool debugResultCodes = false;
-
 bool echoCommands = false;
 
 void makeTouch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold)
@@ -154,7 +204,7 @@ int argmain(int argc, char** argv)
     if (argc == 0)
         return 0;
 
-
+    USBResponse response;
     //peek <address in hex or dec> <amount of bytes in hex or dec>
     if (!strcmp(argv[0], "peek"))
     {
@@ -171,6 +221,12 @@ int argmain(int argc, char** argv)
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
         peekInfinite(meta.heap_base + offset, size);
+		/*if (usb)
+		{
+			response.size = size;
+			response.data = &out[0];
+			sendUsbResponse(response);
+		}*/
     }
 
     if (!strcmp(argv[0], "peekMulti"))
@@ -195,6 +251,12 @@ int argmain(int argc, char** argv)
             sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
+        /*if (usb)
+        {
+            response.size = totalSize;
+            response.data = &out[0];
+            sendUsbResponse(response);
+        }*/
     }
 
     if (!strcmp(argv[0], "peekAbsolute"))
@@ -205,6 +267,12 @@ int argmain(int argc, char** argv)
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
         peekInfinite(offset, size);
+		/*if (usb)
+		{
+			response.size = size;
+			response.data = &out[0];
+			sendUsbResponse(response);
+		}*/
     }
 
     if (!strcmp(argv[0], "peekAbsoluteMulti"))
@@ -222,6 +290,12 @@ int argmain(int argc, char** argv)
             sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
+        /*if (usb)
+        {
+            response.size = totalSize;
+            response.data = &out[0];
+            sendUsbResponse(response);
+        }*/
     }
 
     if (!strcmp(argv[0], "peekMain"))
@@ -239,6 +313,12 @@ int argmain(int argc, char** argv)
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
         peekInfinite(meta.main_nso_base + offset, size);
+		/*if (usb)
+		{
+			response.size = size;
+			response.data = &data[0];
+			sendUsbResponse(response);
+		}*/
     }
 
     if (!strcmp(argv[0], "peekMainMulti"))
@@ -263,6 +343,12 @@ int argmain(int argc, char** argv)
             sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
+        /*if (usb)
+        {
+            response.size = totalSize;
+            response.data = &out[0];
+            sendUsbResponse(response);
+        }*/
     }
 
     //poke <address in hex or dec> <data in hex or dec>
@@ -407,7 +493,14 @@ int argmain(int argc, char** argv)
                 u64 i;
                 for (i = 0; i < outsize - sizeof(buf->nacp); i++)
                 {
-                    printf("%02X", buf->icon[i]);
+                    char* ch = buf->icon[i];
+                    if (usb)
+		            {
+			            response.size = sizeof(ch);
+			            response.data = &ch;
+			            sendUsbResponse(response);
+		            }
+                    else printf("%02X", ch);
                 }
                 printf("\n");
             }
@@ -416,11 +509,25 @@ int argmain(int argc, char** argv)
                 char version[0x11];
                 memset(version, 0, sizeof(version));
                 strncpy(version, buf->nacp.display_version, sizeof(version));
-                printf("%s\n", version);
+
+                if (usb)
+		        {
+			        response.size = sizeof(version);
+			        response.data = &version;
+			        sendUsbResponse(response);
+		        }
+                else printf("%s\n", version);
             }
             if (!strcmp(argv[1], "rating"))
             {
-                printf("%d\n", buf->nacp.rating_age[0]);
+                int rating = buf->nacp.rating_age[0];
+                if (usb)
+		        {
+			        response.size = sizeof(rating);
+			        response.data = &rating;
+			        sendUsbResponse(response);
+		        }
+                else printf("%d\n", rating);
             }
             if (!strcmp(argv[1], "author"))
             {
@@ -428,7 +535,14 @@ int argmain(int argc, char** argv)
                 nacpGetLanguageEntry(&buf->nacp, &langentry);
                 memset(author, 0, sizeof(author));
                 strncpy(author, langentry->author, sizeof(author));
-                printf("%s\n", author);
+
+                if (usb)
+		        {
+			        response.size = sizeof(author);
+			        response.data = &author;
+			        sendUsbResponse(response);
+		        }
+                else printf("%s\n", author);
             }
             if (!strcmp(argv[1], "name"))
             {
@@ -436,7 +550,14 @@ int argmain(int argc, char** argv)
                 nacpGetLanguageEntry(&buf->nacp, &langentry);
                 memset(name, 0, sizeof(name));
                 strncpy(name, langentry->name, sizeof(name));
-                printf("%s\n", name);
+
+                if (usb)
+		        {
+			        response.size = sizeof(name);
+			        response.data = &name;
+			        sendUsbResponse(response);
+		        }
+                else printf("%s\n", name);
             }
         }
         free(buf);
@@ -497,20 +618,36 @@ int argmain(int argc, char** argv)
         MetaData meta = getMetaData();
         if (meta.main_nso_base == 0)
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             return 0;
         }
-        printf("%016lX\n", meta.titleID);
+
+		if (usb)
+		{
+			response.size = sizeof(meta.titleID);
+			response.data = &meta.titleID;
+			sendUsbResponse(response);
+		}
+        else printf("%016lX\n", meta.titleID);
     }
 
     if (!strcmp(argv[0], "getTitleVersion")) {
         MetaData meta = getMetaData();
         if (meta.main_nso_base == 0)
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             return 0;
         }
-        printf("%016lX\n", meta.titleVersion);
+
+		if (usb)
+		{
+			response.size = sizeof(meta.titleVersion);
+			response.data = &meta.titleVersion;
+			sendUsbResponse(response);
+		}
+        else printf("%016lX\n", meta.titleVersion);
     }
 
     if (!strcmp(argv[0], "getSystemLanguage")) {
@@ -520,27 +657,49 @@ int argmain(int argc, char** argv)
         SetLanguage language = SetLanguage_ENUS;
         setGetSystemLanguage(&languageCode);
         setMakeLanguage(languageCode, &language);
-        printf("%d\n", language);
+		if (usb)
+		{
+			response.size = sizeof(language);
+			response.data = &language;
+			sendUsbResponse(response);
+		}
+        else printf("%d\n", language);
     }
 
     if (!strcmp(argv[0], "getMainNsoBase")) {
         MetaData meta = getMetaData();
         if (meta.main_nso_base == 0)
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             return 0;
         }
-        printf("%016lX\n", meta.main_nso_base);
+
+		if (usb)
+		{
+			response.size = sizeof(meta.main_nso_base);
+			response.data = &meta.main_nso_base;
+			sendUsbResponse(response);
+		}
+        else printf("%016lX\n", meta.main_nso_base);
     }
 
     if (!strcmp(argv[0], "getBuildID")) {
         MetaData meta = getMetaData();
         if (meta.main_nso_base == 0)
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             return 0;
         }
-        printf("%02x%02x%02x%02x%02x%02x%02x%02x\n", meta.buildID[0], meta.buildID[1], meta.buildID[2], meta.buildID[3], meta.buildID[4], meta.buildID[5], meta.buildID[6], meta.buildID[7]);
+
+		if (usb)
+		{
+			response.size = sizeof(u8);
+			response.data = &meta.buildID;
+			sendUsbResponse(response);
+		}
+        else printf("%02x%02x%02x%02x%02x%02x%02x%02x\n", meta.buildID[0], meta.buildID[1], meta.buildID[2], meta.buildID[3], meta.buildID[4], meta.buildID[5], meta.buildID[6], meta.buildID[7]);
 
     }
 
@@ -548,10 +707,18 @@ int argmain(int argc, char** argv)
         MetaData meta = getMetaData();
         if (meta.main_nso_base == 0)
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             return 0;
         }
-        printf("%016lX\n", meta.heap_base);
+
+		if (usb)
+		{
+			response.size = sizeof(meta.heap_base);
+			response.data = &meta.heap_base;
+			sendUsbResponse(response);
+		}
+        else printf("%016lX\n", meta.heap_base);
     }
 
     if (!strcmp(argv[0], "isProgramRunning")) {
@@ -559,7 +726,13 @@ int argmain(int argc, char** argv)
             return 0;
         u64 programId = parseStringToInt(argv[1]);
         bool isRunning = getIsProgramOpen(programId);
-        printf("%d\n", isRunning);
+		if (usb)
+		{
+			response.size = sizeof(isRunning);
+			response.data = &isRunning;
+			sendUsbResponse(response);
+		}
+        else printf("%d\n", isRunning);
     }
 
     if (!strcmp(argv[0], "pixelPeek")) {
@@ -573,18 +746,35 @@ int argmain(int argc, char** argv)
         if (R_FAILED(rc) && debugResultCodes)
             printf("capssc, 1204: %d\n", rc);
 
-        u64 i;
-        for (i = 0; i < outSize; i++)
-        {
-            printf("%02X", buf[i]);
-        }
-        printf("\n");
+		if (usb)
+		{
+			response.data = &buf[0];
+			response.size = outSize;
+			sendUsbResponse(response);
+		}
+		else
+		{
+			u64 i;
+			for (i = 0; i < outSize; i++)
+			{
+				printf("%02X", buf[i]);
+			}
+			printf("\n");
+		}
 
         free(buf);
     }
 
-    if (!strcmp(argv[0], "getVersion")) {
-        printf("%s\n", VERSION_S);
+    if(!strcmp(argv[0], "getVersion")){
+        if (usb)
+        {
+            char buf[] = VERSION_S;
+            strcat(buf, "\n");
+            response.data = buf;
+            response.size = sizeof(buf);
+            sendUsbResponse(response);
+        }
+        else printf("%s\n", VERSION_S);
     }
 
     // follow pointers and print absolute offset (little endian, flip it yourself if required)
@@ -593,35 +783,49 @@ int argmain(int argc, char** argv)
     {
         if (argc < 2)
             return 0;
-        s64 jumps[argc - 1];
-        for (int i = 1; i < argc; i++)
-            jumps[i - 1] = parseStringToSignedLong(argv[i]);
-        u64 solved = followMainPointer(jumps, argc - 1);
-        printf("%016lX\n", solved);
-    }
+		s64 jumps[argc - 1];
+		for (int i = 1; i < argc; i++)
+			jumps[i - 1] = parseStringToSignedLong(argv[i]);
+
+		u64 solved = followMainPointer(jumps, argc - 1);
+        if (usb)
+        {
+            response.data = &solved;
+            response.size = sizeof(solved);
+            sendUsbResponse(response);
+        }
+		else printf("%016lX\n", solved);
+	}
 
     // pointerAll <first (main) jump> <additional jumps> <final jump in pointerexpr> 
     // possibly redundant between the one above, one needs to go eventually. (little endian, flip it yourself if required)
-    if (!strcmp(argv[0], "pointerAll"))
-    {
+	if (!strcmp(argv[0], "pointerAll"))
+	{
         if (argc < 3)
             return 0;
         s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
         u64 count = argc - 2;
-        s64 jumps[count];
-        for (int i = 1; i < argc - 1; i++)
-            jumps[i - 1] = parseStringToSignedLong(argv[i]);
-        u64 solved = followMainPointer(jumps, count);
+		s64 jumps[count];
+		for (int i = 1; i < argc - 1; i++)
+			jumps[i - 1] = parseStringToSignedLong(argv[i]);
+		u64 solved = followMainPointer(jumps, count);
         if (solved != 0)
             solved += finalJump;
-        printf("%016lX\n", solved);
-    }
 
-    // pointerRelative <first (main) jump> <additional jumps> <final jump in pointerexpr> 
-    // returns offset relative to heap
-    if (!strcmp(argv[0], "pointerRelative"))
-    {
-        if (argc < 3)
+        if (usb)
+        {
+            response.data = &solved;
+            response.size = sizeof(solved);
+            sendUsbResponse(response);
+        }
+        else printf("%016lX\n", solved);
+	}
+
+	// pointerRelative <first (main) jump> <additional jumps> <final jump in pointerexpr> 
+	// returns offset relative to heap
+	if (!strcmp(argv[0], "pointerRelative"))
+	{
+		if(argc < 3)
             return 0;
         s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
         u64 count = argc - 2;
@@ -635,13 +839,21 @@ int argmain(int argc, char** argv)
             MetaData meta = getMetaData();
             if (meta.main_nso_base == 0)
             {
-                printf("\n");
+                if (!usb)
+                    printf("\n");
                 return 0;
             }
             solved -= meta.heap_base;
         }
-        printf("%016lX\n", solved);
-    }
+
+        if (usb)
+        {
+            response.data = &solved;
+            response.size = sizeof(solved);
+            sendUsbResponse(response);
+        }
+        else printf("%016lX\n", solved);
+	}
 
     // pointerPeek <amount of bytes in hex or dec> <first (main) jump> <additional jumps> <final jump in pointerexpr>
     // warning: no validation
@@ -659,7 +871,13 @@ int argmain(int argc, char** argv)
         u64 solved = followMainPointer(jumps, count);
         solved += finalJump;
         peek(solved, size);
-    }
+        /*if (usb)
+        {
+            response.size = size;
+            response.data = &data[0];
+            sendUsbResponse(response);
+        }*/
+	}
 
     // pointerPeekMulti <amount of bytes in hex or dec> <first (main) jump> <additional jumps> <final jump in pointerexpr> split by asterisks (*)
     // warning: no validation
@@ -708,7 +926,13 @@ int argmain(int argc, char** argv)
         }
 
         peekMulti(offsets, sizes, itemCount);
-    }
+        /*if (usb)
+        {
+            response.size = totalSize;
+            response.data = &out[0];
+            sendUsbResponse(response);
+        }*/
+	}
 
     // pointerPoke <data to be sent> <first (main) jump> <additional jumps> <final jump in pointerexpr>
     // warning: no validation
@@ -740,7 +964,8 @@ int argmain(int argc, char** argv)
         MetaData meta = getMetaData();
         if (meta.main_nso_base == 0)
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             return 0;
         }
 
@@ -945,15 +1170,34 @@ int argmain(int argc, char** argv)
         if (R_FAILED(rc))
             fatalThrow(rc);
         psmGetBatteryChargePercentage(&charge);
-        printf("%d\n", charge);
+
+        if (usb)
+        {
+            response.size = sizeof(u32);
+            response.data = &charge;
+            sendUsbResponse(response);
+        }
+        else printf("%d\n", charge);
         psmExit();
     }
 
     if (!strcmp(argv[0], "fdCount"))
-    {
-        printf("%d\n", fd_count);
+	{
+		if (usb)
+		{
+			response.size = sizeof(int);
+			response.data = fd_count;
+			sendUsbResponse(response);
+		}
+        else printf("%d\n", fd_count);
     }
 
+    if(!strcmp(argv[0], "daySkip"))
+        dateSkip();
+
+    if(!strcmp(argv[0], "resetTime"))
+        resetTime();
+
     return 0;
 }
 
@@ -979,6 +1223,59 @@ void del_from_pfds(struct pollfd pfds[], int i, int* fd_count)
 }
 
 int main()
+{
+    Result rc;
+    initFreezes();
+
+    // freeze thread
+    mutexInit(&freezeMutex);
+    rc = threadCreate(&freezeThread, sub_freeze, (void*)&freeze_thr_state, NULL, THREAD_SIZE, 0x2C, -2);
+    if (R_SUCCEEDED(rc))
+        rc = threadStart(&freezeThread);
+
+    // touch thread
+    mutexInit(&touchMutex);
+    rc = threadCreate(&touchThread, sub_touch, (void*)&currentTouchEvent, NULL, THREAD_SIZE, 0x2C, -2);
+    if (R_SUCCEEDED(rc))
+        rc = threadStart(&touchThread);
+
+    // key thread
+    mutexInit(&keyMutex);
+    rc = threadCreate(&keyboardThread, sub_key, (void*)&currentKeyEvent, NULL, THREAD_SIZE, 0x2C, -2);
+    if (R_SUCCEEDED(rc))
+        rc = threadStart(&keyboardThread);
+
+    // click sequence thread
+    mutexInit(&clickMutex);
+    rc = threadCreate(&clickThread, sub_click, (void*)currentClick, NULL, THREAD_SIZE, 0x2C, -2);
+    if (R_SUCCEEDED(rc))
+        rc = threadStart(&clickThread);
+
+    if (usb)
+        usbMainLoop();
+    else wifiMainLoop();
+
+    if (R_SUCCEEDED(rc))
+    {
+        freeze_thr_state = Exit;
+        threadWaitForExit(&freezeThread);
+        threadClose(&freezeThread);
+        currentTouchEvent.state = 3;
+        threadWaitForExit(&touchThread);
+        threadClose(&touchThread);
+        currentKeyEvent.state = 3;
+        threadWaitForExit(&keyboardThread);
+        threadClose(&keyboardThread);
+        clickThreadState = 1;
+        threadWaitForExit(&clickThread);
+    }
+
+    clearFreezes();
+    freeFreezes();
+    return 0;
+}
+
+void wifiMainLoop()
 {
     char* linebuf = malloc(sizeof(char) * MAX_LINE_LENGTH);
 
@@ -1088,26 +1385,46 @@ int main()
         mutexUnlock(&freezeMutex);
         svcSleepThread(mainLoopSleepTime * 1e+6L);
     }
+}
 
-    if (R_SUCCEEDED(rc))
+void usbMainLoop()
+{
+    USBResponse response;
+    int fr_count = 0;
+    flashLed();
+
+    while (true)
     {
-        freeze_thr_state = Exit;
-        threadWaitForExit(&freezeThread);
-        threadClose(&freezeThread);
-        currentTouchEvent.state = 3;
-        threadWaitForExit(&touchThread);
-        threadClose(&touchThread);
-        currentKeyEvent.state = 3;
-        threadWaitForExit(&keyboardThread);
-        threadClose(&keyboardThread);
-        clickThreadState = 1;
-        threadWaitForExit(&clickThread);
-    }
+        int lenUSB;
+        usbCommsRead(&lenUSB, sizeof(lenUSB)); //Should use malloc
+        char linebufUSB[lenUSB + 1];
 
-    clearFreezes();
-    freeFreezes();
+        mutexLock(&freezeMutex);
+        for (int i = 0; i < lenUSB + 1; i++)
+            linebufUSB[i] = 0;
 
-    return 0;
+        usbCommsRead(&linebufUSB, lenUSB);
+
+        //Adds necessary escape characters for pasrser
+        linebufUSB[lenUSB - 1] = '\n';
+        linebufUSB[lenUSB - 2] = '\r';
+
+        fflush(stdout);
+        parseArgs(linebufUSB, &argmain);
+
+        if (echoCommands)
+        {
+            response.size = sizeof(linebufUSB);
+            response.data = &linebufUSB;
+            sendUsbResponse(response);
+        }
+
+        fr_count = getFreezeCount(false);
+        if (fr_count == 0)
+            freeze_thr_state = Idle;
+        mutexUnlock(&freezeMutex);
+        svcSleepThread(mainLoopSleepTime * 1e+6L);
+    }
 }
 
 void sub_freeze(void* arg)
@@ -1257,3 +1574,17 @@ void sub_click(void* arg)
         svcSleepThread(1e+6L);
     }
 }
+
+bool isUSB()
+{
+    char str[4];
+    FILE* config = fopen("sdmc:/atmosphere/contents/430000000000000B/config.cfg", "r");
+    if (config)
+    {
+        fscanf(config, "%[^\n]", str);
+        fclose(config);
+        if (strcmp(strlwr(str), "wifi") == 0)
+            return false;
+    }
+    return true;
+}

From 73a0e75f3537b3280e464ce811c8804121a7db5c Mon Sep 17 00:00:00 2001
From: Koi <koi.github3088@gmail.com>
Date: Thu, 5 Mar 2026 01:48:47 -0600
Subject: [PATCH 11/13] Fix strange audio skipping issue Rebase to latest sbb
 fixes, fix version format and bump version. Interim rework of time
 get/set/reset. Update README.md Rebase to sys-botbase's update for 19.0.0 Fix
 wrong getVersion assumption during rebase. Update ReadMe.md Fix duplicate
 threads for wifi, minor clean. Default to USB. Fix peekInfinite and game info
 command for usb. Try to fix crash when disconnecting and reconnecting a USB
 cable repeatedly. Update README.md Bring in line with sbb, preliminary update
 for libnx 16.0.0 Fix clickSeq release button not registering Minor refactor,
 make WiFi default if no config file is present, fix pointer reads (thanks,
 Anubis!).

---
 README.md                     |  19 +-
 sys-botbase/source/commands.c | 132 ++++------
 sys-botbase/source/commands.h |  11 +-
 sys-botbase/source/main.c     | 482 ++++++++++++++++++++--------------
 sys-botbase/source/ntp.c      |  63 +++++
 sys-botbase/source/ntp.h      |  59 +++++
 6 files changed, 481 insertions(+), 285 deletions(-)
 create mode 100644 sys-botbase/source/ntp.c
 create mode 100644 sys-botbase/source/ntp.h

diff --git a/README.md b/README.md
index dd21942..f245bde 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# sys-botbase
-A Nintendo Switch (CFW) sys-module that allows users to remote control their switch via sockets as well as read and write to a games memory. This can be used to create bots for games and other fun automation projects.
+# usb-botbase
+A Nintendo Switch (CFW) sys-module that allows users to remote control their Switch via sockets or USB via a config file, as well as read and write to a game's memory. This can be used to create bots for games and other fun automation projects.
 
 ## Features:
 ### Remote Control:
 - Set controller state
-- Simulate buttons press, hold, and release
+- Simulate button press, hold, and release
 - Simulate touch screen drawing
 
 ### Memory Reading and Writing:
@@ -20,13 +20,18 @@ A Nintendo Switch (CFW) sys-module that allows users to remote control their swi
 This project was created for the purpose of development for bot automation. The creators and maintainers of this project are not liable for any damages caused or bans received. Use at your own risk.
 
 ## Installation
-Download [latest release](https://github.com/olliz0r/sys-botbase/releases/latest) and extract into your Nintendo Switch SD card. Restart your switch. 
+1. Download [latest release](https://github.com/Koi-3088/usb-botbase/releases/latest) and extract into your Nintendo Switch SD card.
+2. Open the `config.cfg` located in `atmosphere/contents/43000000000B` using your favorite text editor.
+3. Change text to `wifi` if you want to connect wirelessly using sockets, or `usb` if you want to connect using a USB cable. Defaults to `usb`.
+4. Restart your Switch.
+5. Follow [SysBot's usb-botbase setup guide](https://github.com/kwsch/SysBot.NET/wiki/Configuring-a-new-USB-Connection).
 
-When installed correctly, sys-botbase will make your docked joy-con's home button glow on switch bootup. If this does not happen, sys-botbase is not installed correctly.
+When installed correctly, usb-botbase will make your docked joy-con's home button glow on switch bootup. If this does not happen, usb-botbase is not installed correctly.
 
 ![](joycon-glow.gif)
 
 ## Credits
-- Big thank you to [jakibaki](https://github.com/jakibaki/sys-netcheat) for a great sysmodule base to learn and work with, as well as being helpful on the Reswitched discord!
-- Thanks to RTNX on discord for bringing to my attention a nasty little bug that would very randomly cause RAM poking to go bad and the switch (sometimes) crashing as a result.
+- Big thank you to [jakibaki](https://github.com/jakibaki/sys-netcheat) for a great sysmodule base to learn and work with, as well as being helpful on the ReSwitched Discord!
+- Thanks to RTNX on Discord for bringing to my attention a nasty little bug that would very randomly cause RAM poking to go bad and the switch (sometimes) crashing as a result.
 - Thanks to Anubis for stress testing!
+- Thanks to FishGuy for the initial USB-Botbase implementation.
diff --git a/sys-botbase/source/commands.c b/sys-botbase/source/commands.c
index f279e22..1a68c09 100644
--- a/sys-botbase/source/commands.c
+++ b/sys-botbase/source/commands.c
@@ -14,8 +14,7 @@ HidDeviceType controllerInitializedType = HidDeviceType_FullKey3;
 HiddbgHdlsHandle controllerHandle = { 0 };
 HiddbgHdlsDeviceInfo controllerDevice = { 0 };
 HiddbgHdlsState controllerState = { 0 };
-time_t curTime = 0;
-time_t origTime = 0;
+USBResponse response;
 
 //Keyboard:
 HiddbgKeyboardAutoPilotState dummyKeyboardState = { 0 };
@@ -244,7 +243,6 @@ void detachController()
     hiddbgExit();
     free(workmem);
     bControllerIsInitialised = false;
-
     sessionId.id = 0;
 }
 
@@ -273,23 +271,27 @@ void peek(u64 offset, u64 size)
     Result rc = readMem(out, offset, size);
     if (R_FAILED(rc))
     {
-        printf("\n");
+        if (!usb)
+            printf("\n");
         detach();
         free(out);
         return;
     }
 
-    if (!usb)
+    detach();
+    if (usb)
     {
-        u64 i;
-        for (i = 0; i < size; i++)
-        {
-            printf("%02X", out[i]);
-        }
+        response.size = size;
+        response.data = &out[0];
+        sendUsbResponse(response);
     }
-
-    printf("\n");
-    detach();
+    else
+	{
+		u64 i;
+		for (i = 0; i < size; i++)
+			printf("%02X", out[i]);
+        printf("\n");
+	}
     free(out);
 }
 
@@ -299,7 +301,9 @@ void peekInfinite(u64 offset, u64 size)
     u64 totalFetched = 0;
     u64 i;
     u8* out = malloc(sizeof(u8) * MAX_LINE_LENGTH);
-    if (out == NULL) {
+    u8* usbOut = malloc(size);
+    if (out == NULL || usbOut == NULL) {
+        // add USB handling
         printf("\n");
         return;
     }
@@ -312,25 +316,35 @@ void peekInfinite(u64 offset, u64 size)
         Result rc = readMem(out, offset + totalFetched, thisBuffersize);
         if (R_FAILED(rc))
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             detach();
             free(out);
+            free(usbOut);
             return;
         }
 
-		if (!usb)
-		{
-            for (i = 0; i < thisBuffersize; i++)
-            {
-                printf("%02X", out[i]);
-            }
-		}
+        for (i = 0; i < thisBuffersize; i++)
+        {
+            if (usb)
+                usbOut[totalFetched + i] = out[i];
+            else printf("%02X", out[i]);
+        }
 
         totalFetched += thisBuffersize;
     }
-    printf("\n");
+
     detach();
+    if (usb)
+    {
+        response.size = size;
+        response.data = &usbOut[0];
+        sendUsbResponse(response);
+    }
+    else printf("\n");
+
     free(out);
+    free(usbOut);
 }
 
 void peekMulti(u64* offset, u64* size, u64 count)
@@ -347,7 +361,8 @@ void peekMulti(u64* offset, u64* size, u64 count)
         Result rc = readMem(out + ofs, offset[i], size[i]);
         if (R_FAILED(rc))
         {
-            printf("\n");
+            if (!usb)
+                printf("\n");
             detach();
             free(out);
             return;
@@ -355,16 +370,20 @@ void peekMulti(u64* offset, u64* size, u64 count)
         ofs += size[i];
     }
 
-    if (!usb)
-    {
-        u64 i;
-        for (i = 0; i < totalSize; i++)
-        {
-            printf("%02X", out[i]);
-        }
-    }
-    printf("\n");
     detach();
+    if (usb)
+    {
+        response.size = totalSize;
+        response.data = &out[0];
+        sendUsbResponse(response);
+	}
+	else
+	{
+		u64 i;
+		for (i = 0; i < totalSize; i++)
+			printf("%02X", out[i]);
+        printf("\n");
+	}
     free(out);
 }
 
@@ -604,48 +623,9 @@ void clickSequence(char* seq, u8* token)
     }
 }
 
-void dateSkip()
-{
-    if (origTime == 0)
-    {
-        Result ot = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&origTime);
-        if (R_FAILED(ot))
-            fatalThrow(ot);
-    }
-
-    Result tg = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&curTime); //Current system time
-    if (R_FAILED(tg))
-        fatalThrow(tg);
-
-    Result ts = timeSetCurrentTime(TimeType_NetworkSystemClock, (uint64_t)(curTime + 86400)); //Set new time
-    if (R_FAILED(ts))
-        fatalThrow(ts);
-}
-
-void resetTime()
+void sendUsbResponse(USBResponse response)
 {
-    if (curTime == 0)
-    {
-        Result ct = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&curTime); //Current system time
-        if (R_FAILED(ct))
-            fatalThrow(ct);
-    }
-
-    if (origTime == 0)
-    {
-        Result ct = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&origTime);
-        if (R_FAILED(ct))
-            fatalThrow(ct);
-    }
-
-    struct tm currentTime = *localtime(&curTime);
-    struct tm timeReset = *localtime(&origTime);
-    timeReset.tm_hour = currentTime.tm_hour;
-    timeReset.tm_min = currentTime.tm_min;
-    timeReset.tm_sec = currentTime.tm_sec;
-    Result rt = timeSetCurrentTime(TimeType_NetworkSystemClock, mktime(&timeReset));
-    curTime = 0;
-    origTime = 0;
-    if (R_FAILED(rt))
-        fatalThrow(rt);
+    usbCommsWrite((void*)&response, 4);
+    if (response.size > 0)
+        usbCommsWrite(response.data, response.size);
 }
diff --git a/sys-botbase/source/commands.h b/sys-botbase/source/commands.h
index 2142fe6..9e42729 100644
--- a/sys-botbase/source/commands.h
+++ b/sys-botbase/source/commands.h
@@ -14,6 +14,8 @@ extern u64 keyPressSleepTime;
 extern u64 pollRate;
 extern u32 fingerDiameter;
 extern bool usb;
+extern u8* hdlmem;
+extern size_t hdlmem_size;
 
 typedef struct {
     u64 main_nso_base;
@@ -37,6 +39,12 @@ typedef struct {
     u8 state;
 } KeyData;
 
+typedef struct
+{
+    u64 size;
+    void* data;
+}USBResponse;
+
 #define JOYSTICK_LEFT 0
 #define JOYSTICK_RIGHT 1
 
@@ -67,5 +75,4 @@ u64 followMainPointer(s64* jumps, size_t count);
 void touch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold, u8* token);
 void key(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount);
 void clickSequence(char* seq, u8* token);
-void dateSkip();
-void resetTime();
+void sendUsbResponse(USBResponse response);
diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index f78cb65..5c9538b 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -13,19 +13,14 @@
 #include "util.h"
 #include "freeze.h"
 #include <poll.h>
-#include "time.h"
+#include <time.h>
+#include "ntp.h"
 
 #define TITLE_ID 0x430000000000000B
 #define HEAP_SIZE 0x00480000
 #define THREAD_SIZE 0x1A000
 #define VERSION_S "2.5"
 
-typedef struct
-{
-    u64 size;
-    void* data;
-}USBResponse;
-
 typedef enum {
     Active = 0,
     Exit = 1,
@@ -43,6 +38,10 @@ void sub_click(void* arg);
 void usbMainLoop();
 void wifiMainLoop();
 bool isUSB();
+bool handle_connection();
+void handle_disconnect();
+bool isConnectedToInternet(USBResponse* response);
+void sendResult(uint16_t success, USBResponse* response);
 
 // locks for thread
 Mutex freezeMutex, touchMutex, keyMutex, clickMutex;
@@ -54,7 +53,7 @@ u8 clickThreadState = 0; // 1 = break thread
 KeyData currentKeyEvent = { 0 };
 TouchData currentTouchEvent = { 0 };
 char* currentClick = NULL;
-bool usb = true;
+bool usb = false;
 
 // for cancelling the touch/click thread
 u8 touchToken = 0;
@@ -68,13 +67,6 @@ int fd_size = 5;
 u32 __nx_applet_type = AppletType_None;
 TimeServiceType __nx_time_service_type = TimeServiceType_System;
 
-void sendUsbResponse(USBResponse response)
-{
-    usbCommsWrite((void*)&response, 4);
-    if (response.size > 0)
-        usbCommsWrite(response.data, response.size);
-}
-
 // we override libnx internals to do a minimal init
 void __libnx_initheap(void)
 {
@@ -91,9 +83,11 @@ void __appInit(void)
 {
     Result rc;
     svcSleepThread(20000000000L);
+
     rc = smInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
+
     if (hosversionGet() == 0) {
         rc = setsysInitialize();
         if (R_SUCCEEDED(rc)) {
@@ -104,48 +98,45 @@ void __appInit(void)
             setsysExit();
         }
     }
+
     rc = timeInitialize();
     if (R_FAILED(rc))
     {
         timeExit();
         __nx_time_service_type = TimeServiceType_User;
         rc = timeInitialize();
-        if(R_FAILED(rc))
+        if (R_FAILED(rc))
             fatalThrow(rc);
     }
+
     rc = pmdmntInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
+
     rc = ldrDmntInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
+
     rc = pminfoInitialize();
-	if (R_FAILED(rc)) 
-		fatalThrow(rc);
+    if (R_FAILED(rc))
+        fatalThrow(rc);
+
     rc = fsInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
+
     rc = fsdevMountSdmc();
     if (R_FAILED(rc))
         fatalThrow(rc);
 
-    usb = isUSB();
-    if (usb)
-    {
-        rc = usbCommsInitialize();
-        if (R_FAILED(rc))
-            fatalThrow(rc);
-    }
-    else
-    {
-        rc = socketInitializeDefault();
-        if (R_FAILED(rc))
-            fatalThrow(rc);
-    }
+    bool success = handle_connection();
+    if (!success)
+        fatalThrow(rc);
 
     rc = capsscInitialize();
     if (R_FAILED(rc))
         fatalThrow(rc);
+
     rc = viInitialize(ViServiceType_Default);
     if (R_FAILED(rc))
         fatalThrow(rc);
@@ -153,16 +144,14 @@ void __appInit(void)
 
 void __appExit(void)
 {
-    fsdevUnmountAll();
-    fsExit();
     smExit();
-    nsExit();
-    audoutExit();
     timeExit();
+    pmdmntExit();
+    ldrDmntExit();
+    pminfoExit();
+    handle_disconnect();
+    capsscExit();
     viExit();
-    if (usb)
-        usbCommsExit();
-    else socketExit();
 }
 
 u64 mainLoopSleepTime = 50;
@@ -173,7 +162,7 @@ bool echoCommands = false;
 void makeTouch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hold)
 {
     mutexLock(&touchMutex);
-    memset(&currentTouchEvent, 0, sizeof currentTouchEvent);
+    memset(&currentTouchEvent, 0, sizeof(currentTouchEvent));
     currentTouchEvent.states = state;
     currentTouchEvent.sequentialCount = sequentialCount;
     currentTouchEvent.holdTime = holdTime;
@@ -185,7 +174,7 @@ void makeTouch(HidTouchState* state, u64 sequentialCount, u64 holdTime, bool hol
 void makeKeys(HiddbgKeyboardAutoPilotState* states, u64 sequentialCount)
 {
     mutexLock(&keyMutex);
-    memset(&currentKeyEvent, 0, sizeof currentKeyEvent);
+    memset(&currentKeyEvent, 0, sizeof(currentKeyEvent));
     currentKeyEvent.states = states;
     currentKeyEvent.sequentialCount = sequentialCount;
     currentKeyEvent.state = 1;
@@ -221,12 +210,6 @@ int argmain(int argc, char** argv)
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
         peekInfinite(meta.heap_base + offset, size);
-		/*if (usb)
-		{
-			response.size = size;
-			response.data = &out[0];
-			sendUsbResponse(response);
-		}*/
     }
 
     if (!strcmp(argv[0], "peekMulti"))
@@ -251,12 +234,6 @@ int argmain(int argc, char** argv)
             sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
-        /*if (usb)
-        {
-            response.size = totalSize;
-            response.data = &out[0];
-            sendUsbResponse(response);
-        }*/
     }
 
     if (!strcmp(argv[0], "peekAbsolute"))
@@ -267,12 +244,6 @@ int argmain(int argc, char** argv)
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
         peekInfinite(offset, size);
-		/*if (usb)
-		{
-			response.size = size;
-			response.data = &out[0];
-			sendUsbResponse(response);
-		}*/
     }
 
     if (!strcmp(argv[0], "peekAbsoluteMulti"))
@@ -290,12 +261,6 @@ int argmain(int argc, char** argv)
             sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
-        /*if (usb)
-        {
-            response.size = totalSize;
-            response.data = &out[0];
-            sendUsbResponse(response);
-        }*/
     }
 
     if (!strcmp(argv[0], "peekMain"))
@@ -313,12 +278,6 @@ int argmain(int argc, char** argv)
         u64 offset = parseStringToInt(argv[1]);
         u64 size = parseStringToInt(argv[2]);
         peekInfinite(meta.main_nso_base + offset, size);
-		/*if (usb)
-		{
-			response.size = size;
-			response.data = &data[0];
-			sendUsbResponse(response);
-		}*/
     }
 
     if (!strcmp(argv[0], "peekMainMulti"))
@@ -343,12 +302,6 @@ int argmain(int argc, char** argv)
             sizes[i] = parseStringToInt(argv[(i * 2) + 2]);
         }
         peekMulti(offsets, sizes, itemCount);
-        /*if (usb)
-        {
-            response.size = totalSize;
-            response.data = &out[0];
-            sendUsbResponse(response);
-        }*/
     }
 
     //poke <address in hex or dec> <data in hex or dec>
@@ -490,19 +443,24 @@ int argmain(int argc, char** argv)
         NacpLanguageEntry* langentry = NULL;
         if (outsize != 0) {
             if (!strcmp(argv[1], "icon")) {
+                u8* icon = malloc(outsize);
+
                 u64 i;
                 for (i = 0; i < outsize - sizeof(buf->nacp); i++)
                 {
-                    char* ch = buf->icon[i];
+                    u8 ic = buf->icon[i];
                     if (usb)
-		            {
-			            response.size = sizeof(ch);
-			            response.data = &ch;
-			            sendUsbResponse(response);
-		            }
-                    else printf("%02X", ch);
+                        icon[i] = ic;
+                    else printf("%02X", ic);
                 }
-                printf("\n");
+                if (usb)
+                {
+                    response.size = outsize;
+                    response.data = &icon[0];
+                    sendUsbResponse(response);
+                }
+                else printf("\n");
+                free(icon);
             }
             if (!strcmp(argv[1], "version"))
             {
@@ -511,22 +469,22 @@ int argmain(int argc, char** argv)
                 strncpy(version, buf->nacp.display_version, sizeof(version));
 
                 if (usb)
-		        {
-			        response.size = sizeof(version);
-			        response.data = &version;
-			        sendUsbResponse(response);
-		        }
+                {
+                    response.size = sizeof(version);
+                    response.data = &version;
+                    sendUsbResponse(response);
+                }
                 else printf("%s\n", version);
             }
             if (!strcmp(argv[1], "rating"))
             {
                 int rating = buf->nacp.rating_age[0];
                 if (usb)
-		        {
-			        response.size = sizeof(rating);
-			        response.data = &rating;
-			        sendUsbResponse(response);
-		        }
+                {
+                    response.size = sizeof(rating);
+                    response.data = &rating;
+                    sendUsbResponse(response);
+                }
                 else printf("%d\n", rating);
             }
             if (!strcmp(argv[1], "author"))
@@ -537,11 +495,11 @@ int argmain(int argc, char** argv)
                 strncpy(author, langentry->author, sizeof(author));
 
                 if (usb)
-		        {
-			        response.size = sizeof(author);
-			        response.data = &author;
-			        sendUsbResponse(response);
-		        }
+                {
+                    response.size = sizeof(author);
+                    response.data = &author;
+                    sendUsbResponse(response);
+                }
                 else printf("%s\n", author);
             }
             if (!strcmp(argv[1], "name"))
@@ -552,11 +510,11 @@ int argmain(int argc, char** argv)
                 strncpy(name, langentry->name, sizeof(name));
 
                 if (usb)
-		        {
-			        response.size = sizeof(name);
-			        response.data = &name;
-			        sendUsbResponse(response);
-		        }
+                {
+                    response.size = sizeof(name);
+                    response.data = &name;
+                    sendUsbResponse(response);
+                }
                 else printf("%s\n", name);
             }
         }
@@ -657,12 +615,12 @@ int argmain(int argc, char** argv)
         SetLanguage language = SetLanguage_ENUS;
         setGetSystemLanguage(&languageCode);
         setMakeLanguage(languageCode, &language);
-		if (usb)
-		{
-			response.size = sizeof(language);
-			response.data = &language;
-			sendUsbResponse(response);
-		}
+        if (usb)
+        {
+            response.size = sizeof(language);
+            response.data = &language;
+            sendUsbResponse(response);
+        }
         else printf("%d\n", language);
     }
 
@@ -726,12 +684,12 @@ int argmain(int argc, char** argv)
             return 0;
         u64 programId = parseStringToInt(argv[1]);
         bool isRunning = getIsProgramOpen(programId);
-		if (usb)
-		{
-			response.size = sizeof(isRunning);
-			response.data = &isRunning;
-			sendUsbResponse(response);
-		}
+        if (usb)
+        {
+            response.size = sizeof(isRunning);
+            response.data = &isRunning;
+            sendUsbResponse(response);
+        }
         else printf("%d\n", isRunning);
     }
 
@@ -746,32 +704,30 @@ int argmain(int argc, char** argv)
         if (R_FAILED(rc) && debugResultCodes)
             printf("capssc, 1204: %d\n", rc);
 
-		if (usb)
-		{
-			response.data = &buf[0];
-			response.size = outSize;
-			sendUsbResponse(response);
-		}
-		else
-		{
-			u64 i;
-			for (i = 0; i < outSize; i++)
-			{
-				printf("%02X", buf[i]);
-			}
-			printf("\n");
-		}
+        if (usb)
+        {
+            response.data = &buf[0];
+            response.size = outSize;
+            sendUsbResponse(response);
+        }
+        else
+        {
+            u64 i;
+            for (i = 0; i < outSize; i++)
+            {
+                printf("%02X", buf[i]);
+            }
+            printf("\n");
+        }
 
         free(buf);
     }
 
-    if(!strcmp(argv[0], "getVersion")){
+    if (!strcmp(argv[0], "getVersion")) {
         if (usb)
         {
-            char buf[] = VERSION_S;
-            strcat(buf, "\n");
-            response.data = buf;
-            response.size = sizeof(buf);
+            response.data = VERSION_S;
+            response.size = sizeof(VERSION_S);
             sendUsbResponse(response);
         }
         else printf("%s\n", VERSION_S);
@@ -794,13 +750,13 @@ int argmain(int argc, char** argv)
             response.size = sizeof(solved);
             sendUsbResponse(response);
         }
-		else printf("%016lX\n", solved);
-	}
+        else printf("%016lX\n", solved);
+    }
 
     // pointerAll <first (main) jump> <additional jumps> <final jump in pointerexpr> 
     // possibly redundant between the one above, one needs to go eventually. (little endian, flip it yourself if required)
-	if (!strcmp(argv[0], "pointerAll"))
-	{
+    if (!strcmp(argv[0], "pointerAll"))
+    {
         if (argc < 3)
             return 0;
         s64 finalJump = parseStringToSignedLong(argv[argc - 1]);
@@ -853,7 +809,7 @@ int argmain(int argc, char** argv)
             sendUsbResponse(response);
         }
         else printf("%016lX\n", solved);
-	}
+    }
 
     // pointerPeek <amount of bytes in hex or dec> <first (main) jump> <additional jumps> <final jump in pointerexpr>
     // warning: no validation
@@ -871,13 +827,7 @@ int argmain(int argc, char** argv)
         u64 solved = followMainPointer(jumps, count);
         solved += finalJump;
         peek(solved, size);
-        /*if (usb)
-        {
-            response.size = size;
-            response.data = &data[0];
-            sendUsbResponse(response);
-        }*/
-	}
+    }
 
     // pointerPeekMulti <amount of bytes in hex or dec> <first (main) jump> <additional jumps> <final jump in pointerexpr> split by asterisks (*)
     // warning: no validation
@@ -926,13 +876,7 @@ int argmain(int argc, char** argv)
         }
 
         peekMulti(offsets, sizes, itemCount);
-        /*if (usb)
-        {
-            response.size = totalSize;
-            response.data = &out[0];
-            sendUsbResponse(response);
-        }*/
-	}
+    }
 
     // pointerPoke <data to be sent> <first (main) jump> <additional jumps> <final jump in pointerexpr>
     // warning: no validation
@@ -1182,21 +1126,118 @@ int argmain(int argc, char** argv)
     }
 
     if (!strcmp(argv[0], "fdCount"))
-	{
-		if (usb)
-		{
-			response.size = sizeof(int);
-			response.data = fd_count;
-			sendUsbResponse(response);
-		}
+    {
+        if (usb)
+        {
+            response.size = sizeof(int);
+            response.data = &fd_count;
+            sendUsbResponse(response);
+        }
         else printf("%d\n", fd_count);
     }
 
-    if(!strcmp(argv[0], "daySkip"))
-        dateSkip();
+    if (!strcmp(argv[0], "getSwitchTime"))
+    {
+        time_t posix = 0;
+        Result res = timeGetCurrentTime(TimeType_UserSystemClock, (u64*)&posix);
+        if (R_FAILED(res))
+        {
+            sendResult(0, &response);
+            return 0;
+        }
+
+        struct tm* time = localtime(&posix);
+        if (time->tm_year >= 160)
+        {
+            time->tm_year = 100;
+            time->tm_mon = 0;
+            time->tm_mday = 1;
+
+            res = timeSetCurrentTime(TimeType_NetworkSystemClock, mktime(time));
+            if (R_FAILED(res))
+            {
+                sendResult(0, &response);
+                return 0;
+            }
+
+            posix = mktime(time);
+        }
+
+        if (usb)
+        {
+            response.size = sizeof(long);
+            response.data = &posix;
+            sendUsbResponse(response);
+        }
+        else
+        {
+            printf("%ld\n", posix);
+        }
+    }
+
+    if (!strcmp(argv[0], "setSwitchTime"))
+    {
+        if (argc != 2)
+            return 0;
 
-    if(!strcmp(argv[0], "resetTime"))
-        resetTime();
+        time_t input = (time_t)strtoull(argv[1], NULL, 10);
+        struct tm* toSet = localtime(&input);
+        if (toSet->tm_year >= 160)
+        {
+            int fail = 0;
+            if (usb)
+            {
+                response.size = sizeof(fail);
+                response.data = &fail;
+                sendUsbResponse(response);
+            }
+            else
+            {
+                printf("%d\n", fail);
+            }
+
+            return 0;
+        }
+
+        Result res = timeSetCurrentTime(TimeType_NetworkSystemClock, input);
+        if (R_FAILED(res))
+        {
+            sendResult(0, &response);
+            return 0;
+        }
+
+        sendResult(1, &response);
+    }
+
+    if (!strcmp(argv[0], "resetSwitchTime"))
+    {
+        bool sync;
+        Result res = setsysInitialize();
+        if (R_FAILED(res))
+        {
+            sendResult(0, &response);
+            return 0;
+        }
+
+        res = setsysIsUserSystemClockAutomaticCorrectionEnabled(&sync);
+        if (R_FAILED(res) || !sync)
+        {
+            setsysExit();
+            sendResult(0, &response);
+            return 0;
+        }
+
+        setsysExit();
+        if (!isConnectedToInternet(&response))
+            return 0;
+
+        time_t ntp = ntpGetTime();
+        res = timeSetCurrentTime(TimeType_NetworkSystemClock, ntp);
+        if (R_FAILED(res))
+            sendResult(0, &response);
+
+        sendResult(1, &response);
+    }
 
     return 0;
 }
@@ -1290,36 +1331,8 @@ void wifiMainLoop()
     fd_count = 1;
 
     int newfd;
-
-    Result rc;
     int fr_count = 0;
 
-    initFreezes();
-
-    // freeze thread
-    mutexInit(&freezeMutex);
-    rc = threadCreate(&freezeThread, sub_freeze, (void*)&freeze_thr_state, NULL, THREAD_SIZE, 0x2C, -2);
-    if (R_SUCCEEDED(rc))
-        rc = threadStart(&freezeThread);
-
-    // touch thread
-    mutexInit(&touchMutex);
-    rc = threadCreate(&touchThread, sub_touch, (void*)&currentTouchEvent, NULL, THREAD_SIZE, 0x2C, -2);
-    if (R_SUCCEEDED(rc))
-        rc = threadStart(&touchThread);
-
-    // key thread
-    mutexInit(&keyMutex);
-    rc = threadCreate(&keyboardThread, sub_key, (void*)&currentKeyEvent, NULL, THREAD_SIZE, 0x2C, -2);
-    if (R_SUCCEEDED(rc))
-        rc = threadStart(&keyboardThread);
-
-    // click sequence thread
-    mutexInit(&clickMutex);
-    rc = threadCreate(&clickThread, sub_click, (void*)currentClick, NULL, THREAD_SIZE, 0x2C, -2);
-    if (R_SUCCEEDED(rc))
-        rc = threadStart(&clickThread);
-
     flashLed();
 
     while (true)
@@ -1391,21 +1404,33 @@ void usbMainLoop()
 {
     USBResponse response;
     int fr_count = 0;
-    flashLed();
 
+    flashLed();
     while (true)
     {
         int lenUSB;
-        usbCommsRead(&lenUSB, sizeof(lenUSB)); //Should use malloc
-        char linebufUSB[lenUSB + 1];
+        size_t len = usbCommsRead(&lenUSB, sizeof(lenUSB)); //Should use malloc
+        if (len <= 0)
+        {
+            svcSleepThread(mainLoopSleepTime * 1e+6L);
+            continue;
+        }
 
+        char linebufUSB[lenUSB + 1];
         mutexLock(&freezeMutex);
         for (int i = 0; i < lenUSB + 1; i++)
             linebufUSB[i] = 0;
 
-        usbCommsRead(&linebufUSB, lenUSB);
+        len = usbCommsRead(&linebufUSB, lenUSB);
+        bool failed = lenUSB - 2 > sizeof(linebufUSB) || len <= 0;
+        if (failed)
+        {
+            svcSleepThread(mainLoopSleepTime * 1e+6L);
+            mutexUnlock(&freezeMutex);
+            continue;
+        }
 
-        //Adds necessary escape characters for pasrser
+        //Adds necessary escape characters for parser
         linebufUSB[lenUSB - 1] = '\n';
         linebufUSB[lenUSB - 2] = '\r';
 
@@ -1570,7 +1595,6 @@ void sub_click(void* arg)
         }
 
         clickToken = 0;
-
         svcSleepThread(1e+6L);
     }
 }
@@ -1588,3 +1612,61 @@ bool isUSB()
     }
     return true;
 }
+
+bool handle_connection()
+{
+    Result rc;
+    usb = isUSB();
+    if (usb)
+        rc = usbCommsInitialize();
+    else rc = socketInitializeDefault();
+
+    fsExit();
+    fsdevUnmountAll();
+
+    if (R_FAILED(rc))
+        return false;
+    return true;
+}
+
+void handle_disconnect()
+{
+    if (usb)
+        usbCommsExit();
+    else socketExit();
+}
+
+bool isConnectedToInternet(USBResponse* response)
+{
+    Result res = nifmInitialize(NifmServiceType_User);
+    if (R_FAILED(res))
+    {
+        sendResult(0, response);
+        return false;
+    }
+
+    NifmInternetConnectionStatus status;
+    res = nifmGetInternetConnectionStatus(NULL, NULL, &status);
+    if (R_FAILED(res) || status != NifmInternetConnectionStatus_Connected)
+    {
+        sendResult(0, response);
+        nifmExit();
+        return false;
+    }
+
+    return true;
+}
+
+void sendResult(uint16_t success, USBResponse* response)
+{
+    if (usb)
+    {
+        response->size = sizeof(uint16_t);
+        response->data = &success;
+        sendUsbResponse(*response);
+    }
+    else
+    {
+        printf("%u\n", success);
+    }
+}
diff --git a/sys-botbase/source/ntp.c b/sys-botbase/source/ntp.c
new file mode 100644
index 0000000..0a1ee40
--- /dev/null
+++ b/sys-botbase/source/ntp.c
@@ -0,0 +1,63 @@
+/* This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+For more information, please refer to <https://unlicense.org>
+Additionally, the ntp_packet struct uses code licensed under the BSD 3-clause. See LICENSE-THIRD-PARTY for more
+information. */
+
+#define _BSD_SOURCE
+
+#include "ntp.h"
+#include <string.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <switch.h>
+#include <sys/socket.h>
+#include <stdio.h>
+
+time_t ntpGetTime() {
+    Result si = socketInitializeDefault();
+    if (R_FAILED(si))
+        return 0;
+
+    static const char* SERVER_NAME = "time.cloudflare.com";
+    int sockfd = -1;
+    sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    struct hostent* server;
+    server = gethostbyname(SERVER_NAME);
+
+    struct sockaddr_in serv_addr;
+    memset(&serv_addr, 0, sizeof(struct sockaddr_in));
+    serv_addr.sin_family = AF_INET;
+    memcpy((char*)&serv_addr.sin_addr.s_addr, (char*)server->h_addr_list[0], 4);
+    serv_addr.sin_port = htons(123);
+    connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr));
+
+    ntp_packet packet;
+    memset(&packet, 0, sizeof(ntp_packet));
+    packet.li_vn_mode = (0 << 6) | (4 << 3) | 3;              // LI 0 | Client version 4 | Mode 3
+    packet.txTm_s = htonl(NTP_TIMESTAMP_DELTA + time(NULL));  // Current networktime on the console
+    send(sockfd, (char*)&packet, sizeof(ntp_packet), 0);
+    (size_t)(recv(sockfd, (char*)&packet, sizeof(ntp_packet), 0));
+    packet.txTm_s = ntohl(packet.txTm_s);
+
+    socketExit();
+    return (time_t)(packet.txTm_s - NTP_TIMESTAMP_DELTA);
+}
diff --git a/sys-botbase/source/ntp.h b/sys-botbase/source/ntp.h
new file mode 100644
index 0000000..59b948e
--- /dev/null
+++ b/sys-botbase/source/ntp.h
@@ -0,0 +1,59 @@
+/* This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+For more information, please refer to <https://unlicense.org>
+Additionally, the ntp_packet struct uses code licensed under the BSD 3-clause. See LICENSE-THIRD-PARTY for more
+information. */
+
+#pragma once
+
+#include <time.h>
+
+#define NTP_TIMESTAMP_DELTA 2208988800ull
+
+/* ------------- BEGIN BSD 3-CLAUSE LICENSED CODE-------------------- */
+// https://www.cisco.com/c/en/us/about/press/internet-protocol-journal/back-issues/table-contents-58/154-ntp.html
+// Struct adapted from https://github.com/lettier/ntpclient , see LICENSE-THIRD-PARTY for more information.
+typedef struct {
+    uint8_t li_vn_mode;  // li: two bits, leap indicator. vn: three bits, protocol version number. mode: three bits,
+                         // client mode.
+
+    uint8_t stratum;    // Stratum level of the local clock.
+    uint8_t poll;       // Maximum interval between successive messages.
+    uint8_t precision;  // Precision of the local clock.
+
+    uint32_t rootDelay;       // Total round trip delay time.
+    uint32_t rootDispersion;  // Max error allowed from primary clock source.
+    uint32_t refId;           // Reference clock identifier.
+
+    uint32_t refTm_s;  // Reference time-stamp seconds.
+    uint32_t refTm_f;  // Reference time-stamp fraction of a second.
+
+    uint32_t origTm_s;  // Originate time-stamp seconds.
+    uint32_t origTm_f;  // Originate time-stamp fraction of a second.
+
+    uint32_t rxTm_s;  // Received time-stamp seconds.
+    uint32_t rxTm_f;  // Received time-stamp fraction of a second.
+
+    uint32_t txTm_s;  // Transmit time-stamp seconds.
+    uint32_t txTm_f;  // Transmit time-stamp fraction of a second.
+} ntp_packet;
+/* ------------- END BSD 3-CLAUSE LICENSED CODE-------------------- */
+
+time_t ntpGetTime();

From 1a21e60918b5444707be7d27a853150a8bd19257 Mon Sep 17 00:00:00 2001
From: Eppin <96589679+Eppin@users.noreply.github.com>
Date: Sat, 18 Jul 2026 11:18:53 +0200
Subject: [PATCH 12/13] Update fork version to 2.5

---
 .github/workflows/built.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/built.yml b/.github/workflows/built.yml
index e60d6da..9af4df7 100644
--- a/.github/workflows/built.yml
+++ b/.github/workflows/built.yml
@@ -27,7 +27,7 @@ jobs:
     # Set current version for release naming
     - name: Set current version
       id: version
-      run: echo "VERSION=2.4${{ github.run_number }}" >> "$GITHUB_OUTPUT"
+      run: echo "VERSION=2.5${{ github.run_number }}" >> "$GITHUB_OUTPUT"
 
     # Replace version number and build
     - name: Built

From bceb0d94528640e812f784369740eb25f0271f27 Mon Sep 17 00:00:00 2001
From: Eppin <96589679+Eppin@users.noreply.github.com>
Date: Sat, 18 Jul 2026 11:30:34 +0200
Subject: [PATCH 13/13] Fix build error

---
 sys-botbase/source/main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys-botbase/source/main.c b/sys-botbase/source/main.c
index 5e2b6d9..ee56637 100644
--- a/sys-botbase/source/main.c
+++ b/sys-botbase/source/main.c
@@ -317,7 +317,6 @@ int argmain(int argc, char** argv)
             return 0;
         }
 
-        MetaData meta = getMetaData();
         u64 offset = parseStringToInt(argv[1]);
         u64 size = 0;
         u8* data = parseStringToByteBuffer(argv[2], &size);
@@ -351,7 +350,6 @@ int argmain(int argc, char** argv)
             return 0;
         }
 
-        MetaData meta = getMetaData();
         u64 offset = parseStringToInt(argv[1]);
         u64 size = 0;
         u8* data = parseStringToByteBuffer(argv[2], &size);