From e59582e0613910f8a47b0d6458975a5205d16d4e Mon Sep 17 00:00:00 2001
From: Max <mparisi@stevens.edu>
Date: Thu, 22 Oct 2020 14:47:56 -0400
Subject: decompile code_801DB81C, and revamp the source file layout template
 and type naming convention. Rename unkStruct to ctorStruct

---
 include/code_801DB040.h | 20 ++++++++++----------
 include/code_801DBB3C.h |  8 ++++----
 include/ctorStruct.h    | 17 +++++++++++++++++
 include/unkStruct.h     | 17 -----------------
 4 files changed, 31 insertions(+), 31 deletions(-)
 create mode 100644 include/ctorStruct.h
 delete mode 100644 include/unkStruct.h

(limited to 'include')

diff --git a/include/code_801DB040.h b/include/code_801DB040.h
index ad49669..b9fc27a 100644
--- a/include/code_801DB040.h
+++ b/include/code_801DB040.h
@@ -7,9 +7,9 @@ extern "C" {
 
 #include "SDK/mem.h"
 
-typedef u32 (*FuncPtr)(void*, u32, u32);
+typedef u32 (*gFuncPtr1)(void*, u32, u32);
 
-struct unkClass
+struct gUnkClass1
 {
     u8 unk0;
     u8 unk1;
@@ -19,24 +19,24 @@ struct unkClass
     void* unkC;
     u32 unk10;
     u32 unk14;
-    FuncPtr unk18;
-    unkClass* unk1C;
-    unkClass* unk20;
+    gFuncPtr1 unk18;
+    gUnkClass1* unk1C;
+    gUnkClass1* unk20;
 };
 
 
-unkClass* func_801DB07C(unkClass* p1, BOOL p2);
+gUnkClass1* func_801DB07C(gUnkClass1* p1, BOOL p2);
 void func_801DB15C(u32 p1);
-void* func_801DB270(MEMHeapHandle heap, u32 size, int align, u32 p4, u32 p5, FuncPtr p6);
-void* func_801DB360(u32 size, int align, u32 p3, u32 p4, FuncPtr p5);
-void func_801DB3BC(void* p1, u32 p2, u32 p3, FuncPtr p4);
+void* func_801DB270(MEMHeapHandle heap, u32 size, int align, u32 p4, u32 p5, gFuncPtr1 p6);
+void* func_801DB360(u32 size, int align, u32 p3, u32 p4, gFuncPtr1 p5);
+void func_801DB3BC(void* p1, u32 p2, u32 p3, gFuncPtr1 p4);
 void* func_801DB4BC(u32 p1, u32 p2);
 u32 func_801DB4FC(u32 p1, u32 p2);
 u32 func_801DB548(u32 p1, u32 p2);
 u32 func_801DB5E4(u32 p1, u32 p2);
 void func_801DB644(u32 p1, u32 p2);
 void func_801DB674(u32 p1);
-BOOL func_801DB6D0(u32 p1, u32 p2, MEMHeapHandle p3, u32 p4, u32 p5, FuncPtr p6);
+BOOL func_801DB6D0(u32 p1, u32 p2, MEMHeapHandle p3, u32 p4, u32 p5, gFuncPtr1 p6);
 void func_801DB79C(u32 p1, u32 p2);
 void func_801DB7CC(u32 p1, u32 p2);
 
diff --git a/include/code_801DBB3C.h b/include/code_801DBB3C.h
index 67a3c3c..394bd32 100644
--- a/include/code_801DBB3C.h
+++ b/include/code_801DBB3C.h
@@ -7,14 +7,14 @@ extern "C" {
 
 #include "code_801DB040.h"
 
-struct unkClass2
+struct gUnkClass2
 {
     u8 pad[0x24];
 };
 
-unkClass* func_801DBC58(unkClass2* p1);
-void func_801DBD00(unkClass2* p1, unkClass* p2);
-unkClass2* func_801DBD74(u32 p1, u32 p2);
+gUnkClass1* func_801DBC58(gUnkClass2* p1);
+void func_801DBD00(gUnkClass2* p1, gUnkClass1* p2);
+gUnkClass2* func_801DBD74(u32 p1, u32 p2);
 
 #ifdef __cplusplus
 }
diff --git a/include/ctorStruct.h b/include/ctorStruct.h
new file mode 100644
index 0000000..5c40e77
--- /dev/null
+++ b/include/ctorStruct.h
@@ -0,0 +1,17 @@
+#ifndef POKEREVO_CODE_CTORSTRUCT_H
+#define POKEREVO_CODE_CTORSTRUCT_H
+
+// Note: Many instances of this class appear in .sbss, and they are partially initialized
+// by the static initializers in .ctors
+
+struct ctorStruct
+{
+    u8 unk0;
+    u16 unk2;
+    u8 unk4;
+    u8 unk5;
+    ctorStruct(u8 p1, u16 p2, u8 p3) 
+        : unk0(p1), unk2(p2), unk4(p3) { }
+};
+
+#endif //POKEREVO_CODE_CTORSTRUCT_H
diff --git a/include/unkStruct.h b/include/unkStruct.h
deleted file mode 100644
index d1c304f..0000000
--- a/include/unkStruct.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef POKEREVO_CODE_UNKSTRUCT_H
-#define POKEREVO_CODE_UNKSTRUCT_H
-
-// Note: Many instances of this class appear in .sbss, and they are partially initialized
-// by the static initializers in .ctors
-
-struct unkStruct
-{
-    u8 unk0;
-    u16 unk2;
-    u8 unk4;
-    u8 unk5;
-    unkStruct(u8 p1, u16 p2, u8 p3) 
-        : unk0(p1), unk2(p2), unk4(p3) { }
-};
-
-#endif //POKEREVO_CODE_UNKSTRUCT_H
-- 
cgit v1.2.3