From 170728bbb974602ceb8a52a4226e8b83bf97b17b Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 17 Oct 2020 23:14:47 -0400 Subject: match func_801DAAE0 --- include/code_801DAAE0.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 34bafa0..e0fb6fe 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,9 +5,17 @@ extern "C" { #endif +class unkClass +{ +public: + u8 unk0; + u8 unk1[11]; +}; + +unkClass* func_801DAAE0(void); BOOL func_801DAB28(void); -void *func_801DAD64(size_t); -void func_801DAEA4(void *); +void* func_801DAD64(size_t); +void func_801DAEA4(void*); #ifdef __cplusplus } -- cgit v1.2.3 From f4bba77e25e70dc342724435af05d3ae1fe19c5b Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 00:06:45 -0400 Subject: match func_801DAB28, func_801DAB30, and func_801DAB78 --- include/code_801DAAE0.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index e0fb6fe..b27a833 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,15 +5,22 @@ extern "C" { #endif +// TODO: move +typedef u32 MEMHeapHandle; + + class unkClass { public: u8 unk0; - u8 unk1[11]; + MEMHeapHandle unk4; + u32 unk8; }; unkClass* func_801DAAE0(void); BOOL func_801DAB28(void); +void func_801DAB30(void); +MEMHeapHandle func_801DAB78(void* p1, u32 p2, u16 p3); void* func_801DAD64(size_t); void func_801DAEA4(void*); -- cgit v1.2.3 From 0403eb6c4ba1c8d6fe8bb1e542d6737cb2bfc46e Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 00:55:49 -0400 Subject: match func_801DAC0C, func_801DAC14, func_801DAC44 --- include/code_801DAAE0.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index b27a833..897f09d 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,7 +5,7 @@ extern "C" { #endif -// TODO: move +// TODO: move, determine type definition typedef u32 MEMHeapHandle; @@ -21,6 +21,9 @@ unkClass* func_801DAAE0(void); BOOL func_801DAB28(void); void func_801DAB30(void); MEMHeapHandle func_801DAB78(void* p1, u32 p2, u16 p3); +u32 func_801DAC0C(void); +u32 func_801DAC14(u32 p1); +u16 func_801DAC44(u16 p1); void* func_801DAD64(size_t); void func_801DAEA4(void*); -- cgit v1.2.3 From 3ac8c8de6aefd3d31498a8a638f196838cffd523 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 02:22:36 -0400 Subject: match up to func_801DAF70 --- include/code_801DAAE0.h | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 897f09d..94b9794 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,26 +5,52 @@ extern "C" { #endif -// TODO: move, determine type definition -typedef u32 MEMHeapHandle; +// TODO: move, determine actual type definition +typedef void *MEMHeapHandle; -class unkClass +struct unkClass { -public: u8 unk0; MEMHeapHandle unk4; u32 unk8; }; +struct unkClass2 +{ + MEMHeapHandle heap; + u16 groupID; +}; + + unkClass* func_801DAAE0(void); BOOL func_801DAB28(void); void func_801DAB30(void); MEMHeapHandle func_801DAB78(void* p1, u32 p2, u16 p3); -u32 func_801DAC0C(void); -u32 func_801DAC14(u32 p1); +MEMHeapHandle func_801DAC0C(void); +MEMHeapHandle func_801DAC14(MEMHeapHandle p1); u16 func_801DAC44(u16 p1); -void* func_801DAD64(size_t); +u16 func_801DAC90(MEMHeapHandle heap, u16 groupID); +void* func_801DAC94(MEMHeapHandle heap, u32 size); +void* lbl_801DAC9C(MEMHeapHandle heap, u32 size, int fill); +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); +BOOL func_801DAD1C(MEMHeapHandle heap, void *memBlock, u32 size); +void func_801DAD48(MEMHeapHandle heap, void *memBlock); +u32 func_801DAD58(u32, const void *memBlock); +u32 func_801DAD60(MEMHeapHandle heap); +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 lbl_801DAF1C(void *memBlock, MEMHeapHandle, u32 p3); + + void func_801DAEA4(void*); #ifdef __cplusplus -- cgit v1.2.3 From 8568daeb69769a56131bb4451fe3e18a7a252fb0 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 13:51:17 -0400 Subject: match func_801DAFAC using an inline asm block --- include/code_801DAAE0.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 94b9794..93d9fef 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -20,6 +20,7 @@ struct unkClass2 { MEMHeapHandle heap; u16 groupID; + u32 unk8; }; @@ -49,8 +50,8 @@ void func_801DAEA4(void *memBlock); u32 func_801DAEE0(const void *memBlock); u32 func_801DAEF8(void); void lbl_801DAF1C(void *memBlock, MEMHeapHandle, u32 p3); - - +void func_801DAF70(MEMHeapHandle heap, u16 groupID); +void func_801DAFAC(void *dest, const void *src, size_t n); void func_801DAEA4(void*); #ifdef __cplusplus -- cgit v1.2.3 From d3966a0f679b41932d857feb0341df04e4fd6744 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 16:39:39 -0400 Subject: match code_801DAAE0.cpp --- include/code_801DAAE0.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 93d9fef..0382a63 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,7 +5,6 @@ extern "C" { #endif -// TODO: move, determine actual type definition typedef void *MEMHeapHandle; @@ -23,7 +22,6 @@ struct unkClass2 u32 unk8; }; - unkClass* func_801DAAE0(void); BOOL func_801DAB28(void); void func_801DAB30(void); -- cgit v1.2.3 From f18777bd8f8b34bf5541be31e80686f835a3682a Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 18:13:02 -0400 Subject: add headers, and mark internal functions as static --- include/code_801DAAE0.h | 42 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 0382a63..1647bcf 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -5,24 +5,8 @@ extern "C" { #endif -typedef void *MEMHeapHandle; +#include "SDK/mem.h" - -struct unkClass -{ - u8 unk0; - MEMHeapHandle unk4; - u32 unk8; -}; - -struct unkClass2 -{ - MEMHeapHandle heap; - u16 groupID; - u32 unk8; -}; - -unkClass* func_801DAAE0(void); BOOL func_801DAB28(void); void func_801DAB30(void); MEMHeapHandle func_801DAB78(void* p1, u32 p2, u16 p3); @@ -31,25 +15,21 @@ 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* lbl_801DAC9C(MEMHeapHandle heap, u32 size, int fill); 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); -BOOL func_801DAD1C(MEMHeapHandle heap, void *memBlock, u32 size); -void func_801DAD48(MEMHeapHandle heap, void *memBlock); -u32 func_801DAD58(u32, const void *memBlock); -u32 func_801DAD60(MEMHeapHandle heap); -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); +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 lbl_801DAF1C(void *memBlock, MEMHeapHandle, u32 p3); void func_801DAF70(MEMHeapHandle heap, u16 groupID); -void func_801DAFAC(void *dest, const void *src, size_t n); +void func_801DAFAC(void* dest, const void* src, size_t n); void func_801DAEA4(void*); #ifdef __cplusplus -- cgit v1.2.3 From fbd635cb89c6e6f8f0e1e9603a515b902e69de06 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 18 Oct 2020 20:35:35 -0400 Subject: mark else block of func_801DAFAC as nonmatching --- include/code_801DAAE0.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/code_801DAAE0.h') diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h index 1647bcf..8d3d09d 100644 --- a/include/code_801DAAE0.h +++ b/include/code_801DAAE0.h @@ -29,7 +29,7 @@ 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(void* dest, const void* src, size_t n); +void func_801DAFAC(u32* dest, const u32* src, size_t n); void func_801DAEA4(void*); #ifdef __cplusplus -- cgit v1.2.3