mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-07 10:11:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_model / d_simple_model / d_stage + cleanup (#181)

Browse Source 
* d_model / d_simple_model / cleanup

* d_stage work

* set up saveHIO / remove asm

* d_a_itembase
This commit is contained in:
TakaRikka
2022-02-19 05:22:47 -08:00
committed by GitHub
parent a034bbe617
commit 92864cb8b8
200 changed files with 5001 additions and 13241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_Reset.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
mResetData->mResetPrepare = 0;
}
static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; }
static bool isReturnToMenu() { return mResetData->mReturnToMenu; }
static BOOL isReturnToMenu() { return mResetData->mReturnToMenu; }
static bool isShutdown() { return mResetData->mShutdown; }
static int isReset() { return mResetData->mReset; }
static int get3ButtonResetPort() { return mResetData->m3ButtonResetPort; }
include/m_Do/m_Do_audio.h
+5
View File
@@ -34,6 +34,7 @@ public:
extern JKRSolidHeap* g_mDoAud_audioHeap;
void mDoAud_resetProcess();
bool mDoAud_resetRecover();
void mDoAud_setSceneName(char const* spot, s32 room, s32 layer);
s32 mDoAud_load1stDynamicWave();
@@ -75,4 +76,8 @@ inline bool mDoAud_check1stDynamicWave() {
return Z2AudioMgr::getInterface()->mSceneMgr.check1stDynamicWave();
}
inline void mDoAud_bgmStop(u32 param_0) {
Z2AudioMgr::getInterface()->mSeqMgr.bgmStop(param_0, 0);
}
#endif /* M_DO_M_DO_AUDIO_H */
include/m_Do/m_Do_ext.h
+46 -7
View File
@@ -33,14 +33,14 @@ private:
class mDoExt_btkAnm : public mDoExt_baseAnm {
public:
mDoExt_btkAnm(void) { mBtkAnm = 0; }
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D63C */ int init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
void entry(J3DModelData* data) { entry(data, getFrame()); }
void entry(J3DModelData* data, f32 frame) { entry(&data->getMaterialTable(), frame); }
void init(J3DModelData* data, J3DAnmTextureSRTKey* key, int param_2, int param_3, f32 param_4,
s16 param_5, s16 param_6) {
init(&data->getMaterialTable(), key, param_2, param_3, param_4, param_5, param_6);
int init(J3DModelData* data, J3DAnmTextureSRTKey* key, int param_2, int param_3, f32 param_4,
s16 param_5, s16 param_6) {
return init(&data->getMaterialTable(), key, param_2, param_3, param_4, param_5, param_6);
}
private:
@@ -52,9 +52,17 @@ STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x18);
class mDoExt_brkAnm : public mDoExt_baseAnm {
public:
mDoExt_brkAnm(void) { mBrkAnm = 0; }
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D70C */ int init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
void entry(J3DModelData* data) { entry(data, getFrame()); }
void entry(J3DModelData* data, f32 frame) { entry(&data->getMaterialTable(), frame); }
int init(J3DModelData* data, J3DAnmTevRegKey* anmKey, int param_2, int param_3, f32 param_4,
s16 param_5, s16 param_6) {
return init(&data->getMaterialTable(), anmKey, param_2, param_3, param_4, param_5, param_6);
}
private:
/* 0x14 */ u32 mBrkAnm;
}; // Size: 0x18
@@ -64,9 +72,18 @@ STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18);
class mDoExt_bpkAnm : public mDoExt_baseAnm {
public:
mDoExt_bpkAnm(void) { mBpkAnm = 0; }
/* 8000D47C */ void init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16);
/* 8000D47C */ int init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16);
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
void entry(J3DModelData* data) { entry(data, getFrame()); }
void entry(J3DModelData* data, f32 frame) { entry(&data->getMaterialTable(), frame); }
int init(J3DModelData* data, J3DAnmColor* anmColor, int param_2, int param_3, f32 param_4,
s16 param_5, s16 param_6) {
return init(&data->getMaterialTable(), anmColor, param_2, param_3, param_4, param_5,
param_6);
}
private:
/* 0x14 */ u32 mBpkAnm;
}; // Size: 0x18
@@ -76,11 +93,13 @@ STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18);
class mDoExt_bckAnm : public mDoExt_baseAnm {
public:
mDoExt_bckAnm(void) { mAnm = 0; }
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D7DC */ int init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
/* 8000D9CC */ void entry(J3DModelData*, f32);
/* 8000D9E8 */ void entryJoint(J3DModelData*, u16, f32);
void entry(J3DModelData* data) { entry(data, getFrame()); }
private:
/* 0x14 */ u32 mBckAnm;
/* 0x18 */ u32 mAnm;
@@ -88,6 +107,25 @@ private:
STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C);
class mDoExt_btpAnm : public mDoExt_baseAnm {
public:
mDoExt_btpAnm() { mpAnm = NULL; }
/* 8000D54C */ int init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
void entry(J3DModelData* data) { entry(data, getFrame()); }
void entry(J3DModelData* data, s16 frame) { entry(&data->getMaterialTable(), frame); }
int init(J3DModelData* data, J3DAnmTexPattern* anmPattern, int param_2, int param_3,
f32 param_4, s16 param_5, s16 param_6) {
return init(&data->getMaterialTable(), anmPattern, param_2, param_3, param_4, param_5,
param_6);
}
private:
/* 0x14 */ J3DAnmTexPattern* mpAnm;
};
class J3DTransformInfo;
class mDoExt_McaMorfCallBack1_c {
@@ -185,6 +223,7 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap**, u32, JKRHeap*, u32);
JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32, JKRHeap*, u32);
JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(u32, u32);
JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap**, u32, u32);
u32 mDoExt_adjustSolidHeapToSystem(JKRSolidHeap* pHeap);
JKRHeap* mDoExt_getCurrentHeap();
void mDoExt_removeMesgFont();
void mDoExt_modelUpdateDL(J3DModel*);
include/m_Do/m_Do_mtx.h
+2
View File
@@ -37,11 +37,13 @@ public:
static MtxP get() { return now; }
static void transS(f32 x, f32 y, f32 z) { PSMTXTrans(now, x, y, z); }
static void scaleS(f32 x, f32 y, f32 z) { PSMTXScale(now, x, y, z); }
static void multVec(const Vec* a, Vec* b) { PSMTXMultVec(now, a, b); }
static void XYZrotS(s16 x, s16 y, s16 z) { mDoMtx_XYZrotS(now, x, y, z); }
static void XYZrotM(s16 x, s16 y, s16 z) { mDoMtx_XYZrotM(now, x, y, z); }
static void ZXYrotS(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotS(now, x, y, z); }
static void ZXYrotM(s16 x, s16 y, s16 z) { mDoMtx_ZXYrotM(now, x, y, z); }
static void YrotM(s16 y) { mDoMtx_YrotM(now, y); }
static void YrotS(s16 y) { mDoMtx_YrotS(now, y); }
static Mtx now;
static Mtx buffer[16];