diff options
| author | hatal175 <hatal175@users.noreply.github.com> | 2023-05-18 12:10:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-18 12:10:49 +0300 |
| commit | 2ef82b2b66a8a556f7bdf199f99a9a7e4bc9d3f3 (patch) | |
| tree | a32aa4837cedca61317762cc82a8f00dd33b362f /libs/JSystem/J3DGraphLoader | |
| parent | b7bc5b42a57f7e351c04af1244b3014e228716d3 (diff) | |
| parent | 221f40e6097dfe76c76602aa21aa07d5f760dce4 (diff) | |
Merge branch 'master' into various3
Diffstat (limited to 'libs/JSystem/J3DGraphLoader')
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp | 3 | ||||
| -rw-r--r-- | libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 4bac4d2081..c332c292d5 100644 --- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -5,6 +5,7 @@ #include "JSystem/J3DGraphLoader/J3DClusterLoader.h" #include "dol2asm.h" +#include "dolphin/os/OS.h" #include "dolphin/types.h" // @@ -58,7 +59,6 @@ extern "C" extern char const* const J3DClusterLoader__stringBase0; // SECTION_INIT void memcpy(); -extern "C" void OSReport(); extern "C" void* __nw__FUl(); extern "C" void* __nwa__FUl(); extern "C" void* __nwa__FUli(); @@ -69,7 +69,6 @@ extern "C" void func_8030A530(void* _this, void const*, void const*); extern "C" void func_8030A560(void* _this, void const*, void const*); extern "C" void __ct__13J3DDeformDataFv(); extern "C" void __ct__11J3DDeformerFP13J3DDeformData(); -extern "C" void DCStoreRange(); extern "C" void _savegpr_23(); extern "C" void _savegpr_26(); extern "C" void _restgpr_23(); diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 15bd72207e..5bb9d9f836 100644 --- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -8,6 +8,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSupport.h" #include "dolphin/os/OS.h" +#include "dolphin/types.h" +#include "global.h" // // Forward References: |