Merge pull request #151 from mparisi20/master

decompile code_801DB81C and establish some type-naming and .cpp source file layout conventions

6 files changed, 64 insertions, 19 deletions

diff --git a/include/SDK/OS/OSCache.h b/include/SDK/OS/OSCache.h
new file mode 100644
index 0000000..489ed0b
--- /dev/null
+++ b/include/SDK/OS/OSCache.h
@@ -0,0 +1,14 @@
+#ifndef POKEREVO_OSCACHE_H

+#define POKEREVO_OSCACHE_H

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+void LCEnable(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif //POKEREVO_OSCACHE_H

diff --git a/include/SDK/os.h b/include/SDK/os.h
new file mode 100644
index 0000000..10d4153
--- /dev/null
+++ b/include/SDK/os.h
@@ -0,0 +1,15 @@
+#ifndef POKEREVO_OS_H

+#define POKEREVO_OS_H

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#include "SDK/OS/OSAlloc.h"

+#include "SDK/OS/OSCache.h"

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif //POKEREVO_OS_H

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_801DB81C.h b/include/code_801DB81C.h
new file mode 100644
index 0000000..3414be5
--- /dev/null
+++ b/include/code_801DB81C.h
@@ -0,0 +1,16 @@
+#ifndef POKEREVO_CODE_801DB81C_H

+#define POKEREVO_CODE_801DB81C_H

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+u32 func_801DB978(u8 p1);

+void func_801DB9FC(void);

+void func_801DBA8C(void);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif //POKEREVO_CODE_801DB81C_H

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/unkStruct.h b/include/ctorStruct.h
index d1c304f..5c40e77 100644
--- a/include/unkStruct.h
+++ b/include/ctorStruct.h
@@ -1,17 +1,17 @@
-#ifndef POKEREVO_CODE_UNKSTRUCT_H

-#define POKEREVO_CODE_UNKSTRUCT_H

+#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 unkStruct

+struct ctorStruct

 {

     u8 unk0;

     u16 unk2;

     u8 unk4;

     u8 unk5;

-    unkStruct(u8 p1, u16 p2, u8 p3) 

+    ctorStruct(u8 p1, u16 p2, u8 p3) 

         : unk0(p1), unk2(p2), unk4(p3) { }

 };

 

-#endif //POKEREVO_CODE_UNKSTRUCT_H

+#endif //POKEREVO_CODE_CTORSTRUCT_H