From 6f8f78f701185bf65d962e46ab62d4a0457c53d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Thu, 18 Mar 2021 20:03:46 +0100 Subject: finish heap.c --- include/heap.h | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/heap.h b/include/heap.h index 6f04c5bc..abea9216 100644 --- a/include/heap.h +++ b/include/heap.h @@ -1,9 +1,37 @@ #ifndef POKEDIAMOND_HEAP_H #define POKEDIAMOND_HEAP_H -void * AllocFromHeap(u32 heap_id, u32 size); -void * AllocFromHeapAtEnd(u32 heap_id, u32 size); -void FreeToHeap(void * ptr); +#include "global.h" + +struct UnkStruct_020166C8 +{ + u32 *unk_ptr1; + u32 *unk_ptr2; + void **unk_ptr3; + u16 *unk_ptr4; + u8 *unk_ptr5; + u16 unk_half1; + u16 unk_half2; + u16 unk_half3; + u16 unk_half4; +}; + + +THUMB_FUNC void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size); +THUMB_FUNC s32 FUN_020167F4(); +THUMB_FUNC u32 FUN_0201681C(u32 param0, u32 heap_id, u32 param2); +THUMB_FUNC u32 FUN_02016828(u32 param0, u32 param1, u32 param2); +THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3); +THUMB_FUNC void FUN_020168D0(u32 heap_id); +THUMB_FUNC u32 FUN_02016944(void *param0, u32 param1, u32 param2, u32 param3); +THUMB_FUNC void FUN_02016988(); +void *AllocFromHeap(u32 heap_id, u32 size); +void *AllocFromHeapAtEnd(u32 heap_id, u32 size); +void FreeToHeap(void *ptr); void FUN_02016A8C(u32 heap_id, void * ptr); +THUMB_FUNC u32 FUN_02016AF8(u32 param0); +THUMB_FUNC void FUN_02016B20(u32 param0, u32 param1, u32 param2); +THUMB_FUNC void FUN_02016B44(void *ptr, u32 param1); +THUMB_FUNC u32 FUN_02016B90(u32 param0); #endif //POKEDIAMOND_HEAP_H -- cgit v1.2.3 From dd945442141c666cc9c59afed14e386b9f01b42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Thu, 18 Mar 2021 20:59:06 +0100 Subject: fix warnings --- include/heap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/heap.h b/include/heap.h index abea9216..478c85ea 100644 --- a/include/heap.h +++ b/include/heap.h @@ -5,8 +5,8 @@ struct UnkStruct_020166C8 { - u32 *unk_ptr1; - u32 *unk_ptr2; + void **unk_ptr1; + void **unk_ptr2; void **unk_ptr3; u16 *unk_ptr4; u8 *unk_ptr5; @@ -23,7 +23,7 @@ THUMB_FUNC u32 FUN_0201681C(u32 param0, u32 heap_id, u32 param2); THUMB_FUNC u32 FUN_02016828(u32 param0, u32 param1, u32 param2); THUMB_FUNC u32 FUN_02016834(u32 param0, u32 param1, u32 param2, s32 param3); THUMB_FUNC void FUN_020168D0(u32 heap_id); -THUMB_FUNC u32 FUN_02016944(void *param0, u32 param1, u32 param2, u32 param3); +THUMB_FUNC u32 *FUN_02016944(void *param0, u32 param1, s32 param2, u32 param3); THUMB_FUNC void FUN_02016988(); void *AllocFromHeap(u32 heap_id, u32 size); void *AllocFromHeapAtEnd(u32 heap_id, u32 size); -- cgit v1.2.3 From 2c18674cca148311e00984fa17d9a8fb775edf7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Thu, 18 Mar 2021 21:23:23 +0100 Subject: review changes --- include/heap.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/heap.h b/include/heap.h index 478c85ea..69aedd9e 100644 --- a/include/heap.h +++ b/include/heap.h @@ -5,15 +5,15 @@ struct UnkStruct_020166C8 { - void **unk_ptr1; - void **unk_ptr2; - void **unk_ptr3; - u16 *unk_ptr4; - u8 *unk_ptr5; - u16 unk_half1; - u16 unk_half2; - u16 unk_half3; - u16 unk_half4; + void **unk00; + void **unk04; + void **unk08; + u16 *unk0c; + u8 *unk10; + u16 unk14; + u16 unk16; + u16 unk18; + u16 unk1a; }; -- cgit v1.2.3