diff options
| author | lepelog <lepelog@users.noreply.github.com> | 2021-06-02 14:13:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 08:13:31 -0400 |
| commit | b728ec1ef544571b02ef5fe05f418b9935c2b071 (patch) | |
| tree | d9eff34f05e9f50033a1361745a98571f7354346 /include/JSystem/JKernel | |
| parent | e915df66c806bdff65aa243649f7abfe6cc19227 (diff) | |
J3duclip, fop_actor_mng and related stuff (#131)
* J3DUClipper sinit
* sincosTable_ etc
* decompile JMATrigonometric sinit
* f_op_actor_mng
* move f_op_actor_mng and parts of mDo_ext
* J3DSys sinit
* f_op_scene_req
* failed matching attempt for decodeSZS__9JKRDecompFPUcPUcUlUl
* mX -> x
* fix mCull and fopAcM_prm_class members
* fix a few function parameters
* move missing NON_MATCHING
* remove some unneeded data
* turns out that data was not unused
* remove unused asm
* readd asm deleted by accident
Diffstat (limited to 'include/JSystem/JKernel')
| -rw-r--r-- | include/JSystem/JKernel/JKRExpHeap.h | 9 | ||||
| -rw-r--r-- | include/JSystem/JKernel/JKRSolidHeap.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index 57fad0b8f6..dcadbef8d4 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -75,8 +75,9 @@ public: /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const; /* override */ + u8 field_0x6c; + private: - u32 field_0x6c; u32 field_0x70; u32 field_0x74; CMemBlock* mHeadFreeList; @@ -85,9 +86,9 @@ private: CMemBlock* mTailUsedList; public: - static void createRoot(int, bool); - static void create(u32, JKRHeap*, bool); - static void create(void*, u32, JKRHeap*, bool); + static JKRExpHeap* createRoot(int, bool); + static JKRExpHeap* create(u32, JKRHeap*, bool); + static JKRExpHeap* create(void*, u32, JKRHeap*, bool); }; #endif /* JKREXPHEAP_H */ diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h index c190314459..a61e8cc78b 100644 --- a/include/JSystem/JKernel/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -18,7 +18,6 @@ protected: JKRSolidHeap(void*, u32, JKRHeap*, bool); virtual ~JKRSolidHeap(); - s32 adjustSize(void); void* allocFromHead(u32, int); void* allocFromTail(u32, int); @@ -54,6 +53,8 @@ private: /* 0x78 */ Unknown* field_0x78; public: + s32 adjustSize(void); + static JKRSolidHeap* create(u32, JKRHeap*, bool); }; |