Merge pull request #99 from JeffVi/Lockpick-1.19.10-bdk-upgrade

Fix compile error and index 053 before 120
suchmememanyskill · Jul 7, 2024 · b1460c1 · b1460c1
2 parents 76781f6 + f504c09
commit b1460c1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 32 deletions.
diff --git a/scripts/SystemWipe.te b/scripts/SystemWipe.te
@@ -129,37 +129,6 @@ if(fsexists("bis:/save/"+is[0]))
 	idb.add(0x00)
 	idb.add(0x00)
 
-	# 120 save
-	s=getfilesize("bis:/save/"+is[0])
-	s1=s&0xFF
-	s2=(s>>8)&0xFF
-	s3=(s>>16)&0xFF
-	s4=(s>>24)&0xFF
-	idb.addrange(imen)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba120)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba120)
-	idb.add(s1)
-	idb.add(s2)
-	idb.add(s3)
-	idb.add(s4)
-	idb.add(0x00)
-	idb.add(0x00)
-	idb.add(0x00)
-	idb.add(0x00)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-	idb.addrange(ba0)
-
 	if(!skip53)
 	{
 		# 53 save
@@ -194,6 +163,37 @@ if(fsexists("bis:/save/"+is[0]))
 		idb.addrange(ba0)
 	}
 
+	# 120 save
+	s=getfilesize("bis:/save/"+is[0])
+	s1=s&0xFF
+	s2=(s>>8)&0xFF
+	s3=(s>>16)&0xFF
+	s4=(s>>24)&0xFF
+	idb.addrange(imen)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba120)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba120)
+	idb.add(s1)
+	idb.add(s2)
+	idb.add(s3)
+	idb.add(s4)
+	idb.add(0x00)
+	idb.add(0x00)
+	idb.add(0x00)
+	idb.add(0x00)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+	idb.addrange(ba0)
+
 	idxs=readsave("bis:/save/"+is[2])
 	if(idxs.resize("/imkvdb.arc",idb.len())){p("imkvdb resize failed")pe()}
 	if(idxs.write("/imkvdb.arc",idb)){p("imkvdb write failed")pe()}

diff --git a/source/script/parser.c b/source/script/parser.c
@@ -232,7 +232,7 @@ u8 nextToken(char** inPtr, void** val) {
 				if (!memcmp(t.strToken, in, (t.strToken[1] == '\0') ? 1 : 2)) {
 					//gfx_printf("Token: '%s'\n", t.strToken);
 					ret = Token_Token;
-					*val = t.token;
+					*val = (void*)t.token;
 
 					if (t.strToken[1] != '\0')
 						in++;

diff --git a/source/script/scriptError.c b/source/script/scriptError.c
@@ -1,6 +1,7 @@
 #include "scriptError.h"
 #include "compat.h"
 #include <stdarg.h>
+#include "../hid/hid.h"
 
 s64 scriptCurrentLine;
 u8 scriptLastError = 0;

diff --git a/source/tegraexplorer/tools.c b/source/tegraexplorer/tools.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include "../fs/fscopy.h"
 #include "../utils/utils.h"
+#include <display/di.h>
 
 extern sdmmc_storage_t sd_storage;
 extern bool is_sd_inited;