diff options
| author | lepelog <lepelog@users.noreply.github.com> | 2021-02-13 01:47:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 19:47:46 -0500 |
| commit | aff4c171fcc7c1a6b9a99a14db81711661273d02 (patch) | |
| tree | 572f68ee378c7f369360204da5824a905461fd77 /src/m_Do/m_Do_ext.cpp | |
| parent | 103e9a386536af5c7b3c0b4f184481f0e1acb110 (diff) | |
f_op_actor_mng split & started decomp (#112)
* fop-actor-mng
* rodata
* more actor mng progress
* actor mng progress
* format
* cleanup
* fix Mtx function signatures
* PR suggestion
Co-authored-by: Pheenoh <pheenoh@gmail.com>
Diffstat (limited to 'src/m_Do/m_Do_ext.cpp')
| -rw-r--r-- | src/m_Do/m_Do_ext.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 3a68eb9dfe..06943a2629 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -296,7 +296,6 @@ void mDoExt_createSolidHeapToCurrent(void); void mDoExt_createSolidHeapToCurrent_X1_(void); void mDoExt_createZeldaHeap(void); void mDoExt_destroyExpHeap(void); -void mDoExt_destroySolidHeap(void); void mDoExt_getArchiveHeapPtr(void); void mDoExt_getAssertHeap(void); @@ -325,7 +324,6 @@ void mDoExt_removeSubFont(void); void mDoExt_resIDToIndex(void); void mDoExt_restoreCurrentHeap(void); void mDoExt_setAraCacheSize(void); -void mDoExt_setCurrentHeap(void); void mDoMtx_stack_c_NS_dtor_X1_(void); void normalizeZP__4cXyzFv(void); void outprod__4cXyzCFRC3Vec(void); @@ -1304,7 +1302,7 @@ asm void mDoExt_adjustSolidHeapToSystem(void) { // mDoExt_destroySolidHeap__FP12JKRSolidHeap // mDoExt_destroySolidHeap(JKRSolidHeap*) -asm void mDoExt_destroySolidHeap(void) { +asm void mDoExt_destroySolidHeap(JKRSolidHeap*) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F18C.s" } @@ -1318,7 +1316,7 @@ asm void mDoExt_destroyExpHeap(void) { // mDoExt_setCurrentHeap__FP7JKRHeap // mDoExt_setCurrentHeap(JKRHeap*) -asm void mDoExt_setCurrentHeap(void) { +asm JKRHeap* mDoExt_setCurrentHeap(JKRHeap*) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F1CC.s" } |