Merge remote-tracking branch 'Upstream/master'

This commit is contained in:
jdflyer
2022-01-11 20:24:58 -07:00
259 changed files with 7535 additions and 13034 deletions
+10
View File
@@ -18,6 +18,15 @@ private:
/* 0x0 */ J3DFrameCtrl mFrameCtrl;
}; // Size: 0x14
class mDoExt_transAnmBas : public J3DAnmTransformKey {
public:
mDoExt_transAnmBas(void* bas) { mBas = bas; }
virtual ~mDoExt_transAnmBas();
private:
/* 0x28 */ void* mBas;
};
class mDoExt_btkAnm : public mDoExt_baseAnm {
public:
mDoExt_btkAnm(void) { mBtkAnm = 0; }
@@ -165,6 +174,7 @@ JKRExpHeap* mDoExt_getHostIOHeap();
JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap**, u32, JKRHeap*, u32);
JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32, JKRHeap*, u32);
JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(u32, u32);
JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap**, u32, u32);
JKRHeap* mDoExt_getCurrentHeap();
extern JKRExpHeap* zeldaHeap;
+1
View File
@@ -15,6 +15,7 @@ void mDoMtx_ZrotS(Mtx, s16);
void mDoMtx_YrotS(Mtx, s16);
void mDoMtx_XrotS(Mtx, s16);
void mDoMtx_YrotM(Mtx, s16);
void mDoMtx_MtxToRot(MtxP, csXyz*);
class mDoMtx_stack_c {
public: