diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-30 08:54:50 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-30 08:54:50 -0400 |
| commit | 9da7dd90041b785cb156069ccdf96996d9a162e2 (patch) | |
| tree | 1b0aac0a4dc4569b09735c03a1b6c3af97118c37 /include | |
| parent | af472505c60f7a0463e8195e9039af4806b9d42b (diff) | |
Refactor heap.c using NNS types, 1
Diffstat (limited to 'include')
| -rw-r--r-- | include/game_init.h | 4 | ||||
| -rw-r--r-- | include/heap.h | 19 | ||||
| -rw-r--r-- | include/unk_02016B94.h | 4 |
3 files changed, 17 insertions, 10 deletions
diff --git a/include/game_init.h b/include/game_init.h index 6aaeb6b4..77484689 100644 --- a/include/game_init.h +++ b/include/game_init.h @@ -9,8 +9,8 @@ void FUN_02015EF4(void); void Main_SetVBlankIntrCB(void (*a0)(void *), void * a1); void FUN_02015F1C(void); BOOL FUN_02015F34(void (*a0)(void *), void * a1); -void FUN_02015F6C(void); -void Main_HBlankIntr(BOOL a0); +void Main_CallHBlankCallback(void); +void Main_ToggleHBlankInterrupt(BOOL enableFlag); void FUN_02015FC8(void); void InitSystemForTheGame(void); void InitGraphicMemory(void); diff --git a/include/heap.h b/include/heap.h index de1f5f18..73be3ba6 100644 --- a/include/heap.h +++ b/include/heap.h @@ -2,22 +2,29 @@ #define POKEDIAMOND_HEAP_H #include "global.h" +#include "NNS_FND_expheap.h" + +struct UnkStruct_020EDB10 +{ + u32 size; + OSArenaId arena; +}; struct UnkStruct_020166C8 { - void **unk00; - void **unk04; + NNSFndHeapHandle *heapHandles; + NNSFndHeapHandle *unk04; void **unk08; u16 *unk0c; - u8 *unk10; - u16 unk14; - u16 unk16; + u8 *heapIdxs; + u16 totalNumHeaps; + u16 nTemplates; u16 unk18; u16 unk1a; }; -void FUN_020166C8(u32 *param0, u32 param1, u32 param2, u32 pre_size); +void FUN_020166C8(const struct UnkStruct_020EDB10 *templates, u32 nTemplates, u32 totalNumHeaps, u32 pre_size); s32 FUN_020167F4(); u32 FUN_0201681C(u32 param0, u32 heap_id, u32 param2); u32 FUN_02016828(u32 param0, u32 param1, u32 param2); diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h index fec45cd8..7757b208 100644 --- a/include/unk_02016B94.h +++ b/include/unk_02016B94.h @@ -96,7 +96,7 @@ u32 FUN_02016BB8(u32 *param0); void FUN_02016BBC(const struct GraphicsModes *modes); void FUN_02016BF4(u32 *param0, u32 param1); void FUN_02016C18( - struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3); + struct UnkStruct_02016B94_2 *param0, u8 param1, const struct UnkStruct_02016B94_1 *param2, u8 param3); void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3); u8 FUN_020177DC(u8 param0, u32 param1); void FUN_02017850(u32 param0, u8 *param1, u8 *param2); @@ -264,7 +264,7 @@ void FUN_020190EC(struct UnkStruct_02016B94_2 *param0, u8 param5); void FUN_02019150(struct UnkStruct_02016B94_2 *param0, struct Window *param1, - struct UnkStruct_02016B94_4 *param2); + const struct UnkStruct_02016B94_4 *param2); void FUN_02019178(struct Window *param0); void FUN_020191A4(struct Window *param0, int param1); void CopyWindowToVram(struct Window *param0); |