summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2023-08-06 08:11:16 -0700
committerGitHub <noreply@github.com>2023-08-06 11:11:16 -0400
commit6389d06ee4a46567c8589f764191e8b319ed22dd (patch)
tree7c9240213dcd3e795dc7445bb2789993b7174369 /include
parent44f0a79323a08c107df4217c76e0563f55872a81 (diff)
ovlmgr (001640) OK (#35)
* ovlmgr OK * sprintf * Remove UNUSED from header
Diffstat (limited to 'include')
-rw-r--r--include/boot_functions.h6
-rw-r--r--include/fault.h2
-rw-r--r--include/m_malloc.h6
-rw-r--r--include/malloc.h4
-rw-r--r--include/ovlmgr.h13
-rw-r--r--include/sprintf.h2
-rw-r--r--include/z_std_dma.h2
7 files changed, 21 insertions, 14 deletions
diff --git a/include/boot_functions.h b/include/boot_functions.h
index 575f819..0716d54 100644
--- a/include/boot_functions.h
+++ b/include/boot_functions.h
@@ -4,12 +4,6 @@
#include "ultra64.h"
#include "unknown_structs.h"
-
-// void func_80026240_jp();
-// void func_8002628C_jp();
-// void func_800262D0_jp();
-// void func_800263C0_jp();
-
// void func_8002B910_jp();
// void DoRelocation();
diff --git a/include/fault.h b/include/fault.h
index 9c90b98..b11f03c 100644
--- a/include/fault.h
+++ b/include/fault.h
@@ -66,7 +66,7 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client);
// void Fault_SetFrameBuffer();
// void Fault_Init();
// void Fault_HungupFaultClient();
-// NORETURN void Fault_AddHungupAndCrashImpl();
+NORETURN void Fault_AddHungupAndCrashImpl(const char* exp1, const char* exp2);
// NORETURN void Fault_AddHungupAndCrash();
// void FaultDrawer_SetOsSyncPrintfEnabled();
diff --git a/include/m_malloc.h b/include/m_malloc.h
index 0ac31e6..24b46d5 100644
--- a/include/m_malloc.h
+++ b/include/m_malloc.h
@@ -4,14 +4,14 @@
#include "ultra64.h"
// void zelda_malloc();
-// void zelda_malloc_r();
+void* zelda_malloc_r(size_t size);
// void zelda_realloc();
-// void zelda_free();
+void* zelda_free(void* ptr);
// void zelda_calloc();
// void zelda_GetFreeArena();
// void zelda_CheckArena();
// void zelda_InitArena();
// void zelda_CleanupArena();
-// void zelda_MallocIsInitalized();
+s32 zelda_MallocIsInitalized(void);
#endif
diff --git a/include/malloc.h b/include/malloc.h
index 9e68f5c..5a94816 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -4,9 +4,9 @@
#include "ultra64.h"
// void malloc();
-// void malloc_r();
+void* malloc_r(size_t size);
// void realloc();
-// void free();
+void free(void* ptr);
// void calloc();
// void DisplayArena();
// void GetFreeArena();
diff --git a/include/ovlmgr.h b/include/ovlmgr.h
new file mode 100644
index 0000000..c0b6596
--- /dev/null
+++ b/include/ovlmgr.h
@@ -0,0 +1,13 @@
+#ifndef OVLMGR_H
+#define OVLMGR_H
+
+#include "ultra64.h"
+#include "unk.h"
+
+struct OverlayRelocationSection;
+
+void ovlmgr_LoadImpl(void* vromStart, UNK_TYPE arg1, void* vramStart, void* vramEnd, void* allocatedRamAddr, struct OverlayRelocationSection* ovl, size_t size);
+void ovlmgr_Load(void* vromStart, UNK_TYPE arg1, void* vramStart, void* vramEnd, void* allocatedRamAddr);
+
+
+#endif
diff --git a/include/sprintf.h b/include/sprintf.h
index dd9d212..f7ce338 100644
--- a/include/sprintf.h
+++ b/include/sprintf.h
@@ -5,6 +5,6 @@
// void proutSprintf();
// void vsprintf();
-// void sprintf();
+int sprintf(char* dst, const char* fmt, ...);
#endif
diff --git a/include/z_std_dma.h b/include/z_std_dma.h
index 3945e21..9927304 100644
--- a/include/z_std_dma.h
+++ b/include/z_std_dma.h
@@ -28,7 +28,7 @@ void DmaMgr_RequestSync(void* ram, void* vrom, size_t size);
// void func_80026BC0_jp();
// void func_80026C00_jp();
// void func_80026C28_jp();
-// void func_80026C4C_jp();
+s32 func_80026C4C_jp(void* vromStart, void* vromEnd, void* ovlStart, void* ovlEnd);
void func_80026CAC_jp(void);
void func_80026DA0_jp(void);
// void func_80026DCC_jp();