diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Runtime/__mem.h | 16 | ||||
| -rw-r--r-- | include/SDK/MEM/mem_expHeap.h | 31 | ||||
| -rw-r--r-- | include/SDK/mem.h | 14 | ||||
| -rw-r--r-- | include/code_801DAA30.h | 9 | ||||
| -rw-r--r-- | include/code_801DAAE0.h | 27 | ||||
| -rw-r--r-- | include/unkStruct.h | 5 |
6 files changed, 87 insertions, 15 deletions
diff --git a/include/Runtime/__mem.h b/include/Runtime/__mem.h new file mode 100644 index 0000000..99d53b0 --- /dev/null +++ b/include/Runtime/__mem.h @@ -0,0 +1,16 @@ +#ifndef POKEREVO___MEM_H
+#define POKEREVO___MEM_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void *memset(void *s, int c, size_t n);
+void *memcpy(void *dest, const void *src, size_t n);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //POKEREVO___MEM_H
diff --git a/include/SDK/MEM/mem_expHeap.h b/include/SDK/MEM/mem_expHeap.h new file mode 100644 index 0000000..f28b02c --- /dev/null +++ b/include/SDK/MEM/mem_expHeap.h @@ -0,0 +1,31 @@ +#ifndef POKEREVO_MEM_EXPHEAP_H
+#define POKEREVO_MEM_EXPHEAP_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// TODO: replace void* with type definition
+typedef void *MEMHeapHandle;
+typedef void (*MEMHeapVisitor)(void *memBlock, MEMHeapHandle heap, u32 userParam);
+
+extern MEMHeapHandle lbl_8063E8E8;
+extern MEMHeapHandle lbl_8063E8EC;
+
+MEMHeapHandle MEMCreateExpHeapEx(void* p1, u32 p2, u16 p3);
+u16 MEMSetGroupIDForExpHeap(MEMHeapHandle heap, u16 groupID);
+void *MEMAllocFromExpHeapEx(MEMHeapHandle heap, u32 size, int alignment);
+u32 MEMResizeForMBlockExpHeap(MEMHeapHandle heap, void *memBlock, u32 size);
+void MEMFreeToExpHeap(MEMHeapHandle heap, void *memBlock);
+u32 MEMGetSizeForMBlockExpHeap(const void *memBlock);
+u32 MEMGetTotalFreeSizeForExpHeap(MEMHeapHandle heap);
+u16 MEMGetGroupIDForMBlockExpHeap(const void *memBlock);
+void MEMVisitAllocatedForExpHeap(MEMHeapHandle heap, MEMHeapVisitor visitor, u32 userParam);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //POKEREVO_MEM_EXPHEAP_H
diff --git a/include/SDK/mem.h b/include/SDK/mem.h new file mode 100644 index 0000000..7bcbe6d --- /dev/null +++ b/include/SDK/mem.h @@ -0,0 +1,14 @@ +#ifndef POKEREVO_MEM_H
+#define POKEREVO_MEM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "MEM/mem_expHeap.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //POKEREVO_MEM_H
diff --git a/include/code_801DAA30.h b/include/code_801DAA30.h deleted file mode 100644 index 167f01c..0000000 --- a/include/code_801DAA30.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEREVO_CODE_801DAA30_H
-#define POKEREVO_CODE_801DAA30_H
-
-void* operator new(size_t sz);
-void* operator new[](size_t sz);
-void operator delete(void* ptr);
-void operator delete[](void* ptr);
-
-#endif //POKEREVO_CODE_801DAA30_H
diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 34bafa0..8d3d09d 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,9 +5,32 @@ extern "C" {
#endif
+#include "SDK/mem.h"
+
BOOL func_801DAB28(void);
-void *func_801DAD64(size_t);
-void func_801DAEA4(void *);
+void func_801DAB30(void);
+MEMHeapHandle func_801DAB78(void* p1, u32 p2, u16 p3);
+MEMHeapHandle func_801DAC0C(void);
+MEMHeapHandle func_801DAC14(MEMHeapHandle p1);
+u16 func_801DAC44(u16 p1);
+u16 func_801DAC90(MEMHeapHandle heap, u16 groupID);
+void* func_801DAC94(MEMHeapHandle heap, u32 size);
+void* func_801DAD00(MEMHeapHandle heap, u32 size);
+void* func_801DAD08(MEMHeapHandle heap, u32 size, int alignment);
+void* func_801DAD0C(MEMHeapHandle heap, u32 size, int alignment);
+void func_801DAD48(MEMHeapHandle heap, void* memBlock);
+u32 func_801DAD58(u32, const void* memBlock);
+void* func_801DAD64(size_t size);
+void* func_801DAD98(u32 size);
+void* func_801DADCC(u32 size, int alignment);
+void* func_801DAE10(u32 size, int alignment);
+BOOL func_801DAE60(void* memBlock, u32 size);
+void func_801DAEA4(void* memBlock);
+u32 func_801DAEE0(const void* memBlock);
+u32 func_801DAEF8(void);
+void func_801DAF70(MEMHeapHandle heap, u16 groupID);
+void func_801DAFAC(u32* dest, const u32* src, size_t n);
+void func_801DAEA4(void*);
#ifdef __cplusplus
}
diff --git a/include/unkStruct.h b/include/unkStruct.h index 73d3cfc..d1c304f 100644 --- a/include/unkStruct.h +++ b/include/unkStruct.h @@ -4,15 +4,12 @@ // Note: Many instances of this class appear in .sbss, and they are partially initialized
// by the static initializers in .ctors
-class unkStruct
+struct unkStruct
{
u8 unk0;
u16 unk2;
u8 unk4;
u8 unk5;
- u8 unk6;
- u8 unk7;
-public:
unkStruct(u8 p1, u16 p2, u8 p3)
: unk0(p1), unk2(p2), unk4(p3) { }
};
|