diff options
| author | enzofc708 <47937189+enzofc708@users.noreply.github.com> | 2026-08-04 14:45:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-08-04 19:45:49 +0200 |
| commit | 29e3578e388b2ff350388e2cdfe45497c4ebdae2 (patch) | |
| tree | 1019aca1a8142880209e954487d37f3a03fb8aa2 /src | |
| parent | 51640eb100522a3986779599f057d72c8cb9e42e (diff) | |
* add heap.c
* add frmh heap
* add heap_list
* add unth heap
* link heap.c
* fix external references
Diffstat (limited to 'src')
| -rw-r--r-- | src/04_Load/Actor/ActorManager_04.cpp | 6 | ||||
| -rw-r--r-- | src/08_GameStart/Init.cpp | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/04_Load/Actor/ActorManager_04.cpp b/src/04_Load/Actor/ActorManager_04.cpp index 84a1f970..497f0208 100644 --- a/src/04_Load/Actor/ActorManager_04.cpp +++ b/src/04_Load/Actor/ActorManager_04.cpp @@ -129,7 +129,6 @@ THUMB void ActorManager::func_ov004_0210532c() { return; } -extern "C" void func_020174a4(u32 *, void *); extern "C" void func_ov017_02168a90(); extern "C" void func_ov025_0216d6dc(); extern "C" void func_ov029_0216d6f0(unk32 *); @@ -147,7 +146,7 @@ THUMB void ActorManager::func_ov004_021053dc() { this->DeleteActor(i, true); } } - func_020174a4(data_027e0ce0[1], this->mActorTable); + Heap_EXPHFreeBlock((Heap_Header *) data_027e0ce0[1], this->mActorTable); this->mActorTable = NULL; delete this->mUnk_14; this->mUnk_14 = NULL; @@ -179,7 +178,6 @@ THUMB void ActorManager::func_ov004_021053dc() { } extern "C" void func_ov000_020c3388(unk32); -extern "C" void *NewEXPH(u32 *id, s32 length, s32 param_3); THUMB void ActorManager::func_ov004_021054a4(FileEntryFlag *param1, s32 param2, unk32 param3) { u16 sVar1; u16 sVar2; @@ -205,7 +203,7 @@ THUMB void ActorManager::func_ov004_021054a4(FileEntryFlag *param1, s32 param2, } param1->vfunc_0c(); func_ov000_020c3388(sVar2); - this->mActorTable = (Actor **) NewEXPH(data_027e0ce0[1], this->mMaxActors * 4, 4); + this->mActorTable = (Actor **) Heap_EXPHNew((Heap_Header *) data_027e0ce0[1], this->mMaxActors * 4, 4); Fill256(0, this->mActorTable, this->mMaxActors * 4); this->mUnk_14 = new(data_027e0ce0[1], 4) ActorManager_Unk14(this->mMaxActors); } diff --git a/src/08_GameStart/Init.cpp b/src/08_GameStart/Init.cpp index 0481ca38..ce835be9 100644 --- a/src/08_GameStart/Init.cpp +++ b/src/08_GameStart/Init.cpp @@ -15,6 +15,7 @@ #include "Unknown/UnkStruct_027e0d54.hpp" #include "Unknown/UnkStruct_027e0dbc.hpp" #include "Unknown/UnkStruct_027e0f88.hpp" +#include "nds/heap.h" extern "C" { void func_0200a23c(); @@ -22,9 +23,7 @@ void func_0200a318(u8 *); unk32 func_0200dd94(); unk32 func_0200a284(u8 *); u16 func_ov001_020efdac(); -void *NewEXPH(char *id, s32 length, s32 param_3); unk32 func_ov000_020773c0(); -void func_020174a4(u32 *, void *); void func_0201f378(); void func_0202019c(void *, const char *, u32 *, unk32); void func_020213f0(u32 *); @@ -165,13 +164,13 @@ ARM UnkStruct_020ee698::UnkStruct_020ee698() : mUnk_02(0), mUnk_04(func_ov001_020efdac()), mUnk_08(0x0D) { - void *newHeap = NewEXPH((char *) data_027e0ce0[1], 0x700, 0x20); + void *newHeap = Heap_EXPHNew((Heap_Header *) data_027e0ce0[1], 0x700, 0x20); if (func_ov000_020773c0() == 3) { this->mUnk_00 = 1; } - func_020174a4(data_027e0ce0[1], newHeap); + Heap_EXPHFreeBlock((Heap_Header *) data_027e0ce0[1], newHeap); } // --- data_ov000_020ee734 --- |