more code clean up

AntiMach · Sep 1, 2022 · 7896379 · 7896379
1 parent 07a424e
commit 7896379
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 149 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 # TARGET #
-
 TARGET := 3DS
 LIBRARY := 0
 
@@ -10,15 +9,13 @@ ifeq ($(TARGET),$(filter $(TARGET),3DS WIIU))
 endif
 
 # COMMON CONFIGURATION #
-
 NAME := Simple Badge Injector
 
 BUILD_DIR := build
 OUTPUT_DIR := output
 INCLUDE_DIRS := include
 SOURCE_DIRS := source
 
-
 EXTRA_OUTPUT_FILES :=
 
 LIBRARY_DIRS := 
@@ -29,18 +26,16 @@ RUN_FLAGS :=
 
 VERSION_MAJOR := 1
 VERSION_MINOR := 3
-VERSION_MICRO := 0
+VERSION_MICRO := 1
 
 # 3DS/Wii U CONFIGURATION #
-
 ifeq ($(TARGET),$(filter $(TARGET),3DS WIIU))
     TITLE := $(NAME)
     DESCRIPTION := An app that injects badge data
     AUTHOR := AntiMach
 endif
 
 # 3DS CONFIGURATION #
-
 ifeq ($(TARGET),3DS)
     LIBRARY_DIRS += $(DEVKITPRO)/libctru
     LIBRARIES += ctru
@@ -67,5 +62,4 @@ ifeq ($(TARGET),3DS)
 endif
 
 # INTERNAL #
-
 include buildtools/make_base
diff --git a/include/defs.h b/include/defs.h
@@ -7,9 +7,10 @@
 
 #define STATUS(x) x & 0xF00
 
-#define OPTION_CANCEL       (0x00 | OK)
-#define NO_MEMORY           (0x01 | FAIL)
-#define EXIT                (0x02 | OK)
+#define CONTINUE            (0x00 | OK)
+#define EXIT                (0x01 | OK)
+#define NO_MEMORY           (0x02 | FAIL)
+#define OPTION_CANCEL       (0x03 | OK)
 
 #define EXTDATA_EXIST       (0x20 | OK)
 #define EXTDATA_NOT_EXIST   (0x21 | FAIL)
@@ -36,7 +37,7 @@
 #define BADGE_DATA          "/BadgeData.dat"
 #define BADGE_MNG           "/BadgeMngFile.dat"
 
-#define APP_ROOT            "/3ds/SimpleBadgeEditor"
+#define APP_ROOT            "/3ds/SimpleBadgeInjector"
 #define APP_BADGE_DATA      APP_ROOT BADGE_DATA
 #define APP_BADGE_MNG       APP_ROOT BADGE_MNG
 
@@ -50,4 +51,9 @@
 const u32 EXTDATA_LOW[] = {MEDIATYPE_SD, 0x000014d1, 0};
 const FS_Path EXTDATA_PATH = (FS_Path){PATH_BINARY,0xC,EXTDATA_LOW};
 
+typedef struct {
+    u8 data[BADGE_DATA_SIZE];
+    u8 mngFile[BADGE_MNG_SIZE];
+} BadgeBufferStruct, *BadgeBuffer;
+
 #endif
diff --git a/source/actu.c b/source/actu.c
@@ -2,15 +2,18 @@
 
 static Handle actHandle;
 
-Result actInit(void) {
+Result actInit(void)
+{
     return srvGetServiceHandle(&actHandle, "act:u");
 }
 
-Result actExit(void) {
+Result actExit(void)
+{
     return svcCloseHandle(actHandle);
 }
 
-Result actuInit(u32 sdkVersion, u32 unknown, Handle handle) {
+Result actuInit(u32 sdkVersion, u32 unknown, Handle handle)
+{
     Result ret = 0;
     u32 *cmdbuf = getThreadCommandBuffer();
 
@@ -22,12 +25,14 @@ Result actuInit(u32 sdkVersion, u32 unknown, Handle handle) {
     cmdbuf[5] = 0x0;
     cmdbuf[6] = handle;
 
-    if((ret = svcSendSyncRequest(actHandle))!=0) return ret;
+    if ((ret = svcSendSyncRequest(actHandle)) != 0)
+        return ret;
 
     return (Result)cmdbuf[1];
 }
 
-Result actuGetAccountDataBlock(u32 unknown, u32 size, u32 blockId, void* output) {
+Result actuGetAccountDataBlock(u32 unknown, u32 size, u32 blockId, void *output)
+{
     Result ret = 0;
     u32 *cmdbuf = getThreadCommandBuffer();
 
@@ -36,9 +41,10 @@ Result actuGetAccountDataBlock(u32 unknown, u32 size, u32 blockId, void* output)
     cmdbuf[2] = size;
     cmdbuf[3] = blockId;
     cmdbuf[4] = (size << 4) | 0xC;
-    cmdbuf[5] = (u32) output;
+    cmdbuf[5] = (u32)output;
 
-    if((ret = svcSendSyncRequest(actHandle))!=0) return ret;
+    if ((ret = svcSendSyncRequest(actHandle)) != 0)
+        return ret;
 
     return (Result)cmdbuf[1];
 }
diff --git a/source/ext.c b/source/ext.c
@@ -4,13 +4,13 @@ u8 null_smdh[0x36C0] = {0};
 
 Result createExtSaveData(u32 extdataID)
 {
-	Handle* handle = fsGetSessionHandle();
+	Handle *handle = fsGetSessionHandle();
 
-	u32* cmdbuf = getThreadCommandBuffer();
+	u32 *cmdbuf = getThreadCommandBuffer();
 
 	u32 directory_limit = 1000;
 	u32 file_limit = 1000;
-	
+
 	cmdbuf[0] = 0x08300182;
 	cmdbuf[1] = MEDIATYPE_SD;
 	cmdbuf[2] = extdataID;
@@ -19,27 +19,27 @@ Result createExtSaveData(u32 extdataID)
 	cmdbuf[5] = directory_limit;
 	cmdbuf[6] = file_limit;
 	cmdbuf[7] = (0x36C0 << 4) | 0xA;
-	cmdbuf[8] = (u32) &null_smdh;
+	cmdbuf[8] = (u32)&null_smdh;
 
 	Result ret = 0;
-	if((ret = svcSendSyncRequest(*handle)))
+	if ((ret = svcSendSyncRequest(*handle)))
 		return ret;
 
 	return cmdbuf[1];
 }
 
 Result deleteExtSaveData(u32 extdataID)
 {
-	Handle* handle = fsGetSessionHandle();
+	Handle *handle = fsGetSessionHandle();
+
+	u32 *cmdbuf = getThreadCommandBuffer();
 
-	u32* cmdbuf = getThreadCommandBuffer();
-
 	cmdbuf[0] = 0x08350080;
 	cmdbuf[1] = MEDIATYPE_SD;
 	cmdbuf[2] = extdataID;
 
 	Result ret = 0;
-	if((ret = svcSendSyncRequest(*handle)))
+	if ((ret = svcSendSyncRequest(*handle)))
 		return ret;
 
 	return cmdbuf[1];