diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-11-10 23:54:31 -0800 |
|---|---|---|
| committer | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-11-10 23:54:31 -0800 |
| commit | 70eabb12bd5e9327ccd01b1f9367fca109d4fbfa (patch) | |
| tree | bc478c843622a25b54dd87479b6575be425b7488 /rel | |
| parent | 74ed2da8bc93804373cddf64c0c878603150b699 (diff) | |
wip
Diffstat (limited to 'rel')
| -rw-r--r-- | rel/d/a/d_a_boomerang/d_a_boomerang.cpp | 258 | ||||
| -rw-r--r-- | rel/d/a/d_a_crod/d_a_crod.cpp | 81 | ||||
| -rw-r--r-- | rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp | 416 | ||||
| -rw-r--r-- | rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp | 32 |
4 files changed, 35 insertions, 752 deletions
diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index 4819b54c46..0a7ca0e6f1 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -11,21 +11,6 @@ // Types: // -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266C18 */ void operator/(f32) const; - /* 80267128 */ void atan2sX_Z() const; - /* 80267150 */ void atan2sY_XZ() const; - /* 8049EE8C */ ~cXyz(); - /* 804A27FC */ cXyz(); -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -34,77 +19,10 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct fopAcM_wt_c { - /* 8001DD84 */ void waterCheck(cXyz const*); - - static f32 mWaterY[1 + 1 /* padding */]; -}; - -struct fopAcM_rc_c { - /* 8001DD1C */ void roofCheck(cXyz const*); - - static u8 mRoofCheck[80]; - static f32 mRoofY; -}; - -struct J3DModel {}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; -struct daBoomerang_sight_c { - /* 8049E0B8 */ void createHeap(); - /* 8049E36C */ void initialize(); - /* 8049EB64 */ void playAnime(int, int); - /* 8049EDA8 */ void initFrame(int); - /* 8049EDE8 */ void copyNumData(int); - /* 8049EEC8 */ void setSight(cXyz const*, int); - /* 8049EF60 */ void draw(); - /* 804A278C */ ~daBoomerang_sight_c(); -}; - -struct daBoomerang_c { - /* 8049F280 */ void windModelCallBack(); - /* 8049F39C */ void draw(); - /* 8049F5F4 */ void lockLineCallback(fopAc_ac_c*); - /* 8049F660 */ void moveLineCallback(fopAc_ac_c*); - /* 8049F710 */ void pushLockList(int); - /* 8049F818 */ void cancelLockActorBase(fopAc_ac_c*); - /* 8049F874 */ void setAimActorBase(fopAc_ac_c*); - /* 8049F8B0 */ void setLockActor(fopAc_ac_c*, int); - /* 8049F9A4 */ void resetLockActor(); - /* 8049F9F0 */ void setRoomInfo(); - /* 8049FAA4 */ void setKeepMatrix(); - /* 8049FBAC */ void setMoveMatrix(); - /* 8049FCD0 */ void setRotAngle(); - /* 8049FD6C */ void setAimPos(); - /* 8049FE6C */ void checkBgHit(cXyz*, cXyz*); - /* 804A006C */ void setEffectTraceMatrix(u32*, u16); - /* 804A012C */ void setEffect(); - /* 804A0874 */ void procWait(); - /* 804A0F0C */ void procMove(); - /* 804A1814 */ void execute(); - /* 804A1BF4 */ ~daBoomerang_c(); - /* 804A1EE4 */ void createHeap(); - /* 804A2084 */ void create(); - /* 804A230C */ daBoomerang_c(); -}; - struct daBoomerang_HIO_c0 { static u16 const m_lockWaitTime; static f32 const m_minCircleR; @@ -114,8 +32,6 @@ struct daBoomerang_HIO_c0 { static f32 const m_lockWindScale; }; -struct J3DAnmBase {}; - struct daAlink_c { /* 8009D884 */ void getAlinkArcName(); /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*); @@ -129,24 +45,8 @@ struct daAlink_c { /* 800E08C4 */ void returnBoomerang(int); }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C1E4 */ void getResInfo(char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -157,8 +57,6 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct cBgS_PolyInfo {}; - struct dBgS { /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); /* 80074DAC */ void GetUnderwaterRoofCode(cBgS_PolyInfo const&); @@ -166,29 +64,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir {}; - -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*); - /* 80076AAC */ void CrrPos(dBgS&); -}; - -struct dPaPo_c { - /* 80050C9C */ void init(dBgS_Acch*, f32, f32); - /* 80051008 */ void setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, - csXyz const*, cXyz const*, s8, f32, f32); -}; - -struct dDlst_base_c { - /* 804A2718 */ void draw(); -}; - -struct dDlst_list_c { - /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*); -}; - struct cCcD_Obj {}; struct dCcMassS_Mng { @@ -223,47 +98,6 @@ struct dCcD_Cps { /* 80084824 */ void CalcAtVec(); }; -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); -}; - -struct dBgS_ObjLinChk { - /* 80077F5C */ dBgS_ObjLinChk(); - /* 80077FB8 */ ~dBgS_ObjLinChk(); -}; - -struct dBgS_ObjGndChk { - /* 804A2524 */ ~dBgS_ObjGndChk(); -}; - -struct dBgS_ObjAcch { - /* 804A2688 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgS_GndChk { - /* 8007757C */ dBgS_GndChk(); - /* 800775F0 */ ~dBgS_GndChk(); -}; - -struct dBgS_BoomerangLinChk { - /* 800782B8 */ dBgS_BoomerangLinChk(); - /* 80078314 */ ~dBgS_BoomerangLinChk(); -}; - -struct cM3dGPla { - /* 804A082C */ ~cM3dGPla(); -}; - -struct cM3dGCyl { - /* 8026F1DC */ void SetC(cXyz const&); - /* 8026F1F8 */ void SetH(f32); - /* 804A259C */ ~cM3dGCyl(); -}; - struct cM3dGCps { /* 8026EF88 */ cM3dGCps(); /* 8026EFA4 */ ~cM3dGCps(); @@ -282,29 +116,12 @@ struct cCcD_GStts { /* 804A271C */ ~cCcD_GStts(); }; -struct cBgS_LinChk {}; - -struct cBgS_GndChk { - /* 80267D28 */ void SetPos(cXyz const*); -}; - struct cBgS { /* 800743B4 */ void LineCross(cBgS_LinChk*); /* 800744A0 */ void GroundCross(cBgS_GndChk*); /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct Z2SoundObjSimple { - /* 802BE844 */ Z2SoundObjSimple(); -}; - -struct Z2SoundObjBase { - /* 802BDF48 */ ~Z2SoundObjBase(); - /* 802BDFF8 */ void deleteObject(); -}; - -struct JAISoundID {}; - struct Z2SeMgr { /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); }; @@ -317,51 +134,11 @@ struct JMath { static u8 sincosTable_[65536]; }; -struct JKRFileLoader { - /* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*); -}; - -struct JKRArchive {}; - -struct JGeometry { - template <typename A1> - struct TVec3 {}; - /* TVec3<f32> */ - struct TVec3__template0 {}; -}; - -struct J3DSys { - static u8 mCurrentMtx[48]; -}; - -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); -}; - -struct J3DJoint {}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 804A2800 */ ~J3DFrameCtrl(); -}; - -struct J2DGrafContext {}; - -struct J2DScreen { - /* 802F8498 */ J2DScreen(); - /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*); - /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); - /* 802F9690 */ void animation(); -}; - struct J2DAnmLoaderDataBase { /* 80308A6C */ void load(void const*); }; + // // Forward References: // @@ -547,11 +324,6 @@ extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); extern "C" void init__12J3DFrameCtrlFs(); extern "C" void searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData(); extern "C" void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void PSVECSquareDistance(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -585,13 +357,10 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mRoofCheck__11fopAcM_rc_c[80]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mRoofY__11fopAcM_rc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; extern "C" extern u8 struct_8045101C[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -831,7 +600,8 @@ asm void daBoomerang_sight_c::copyNumData(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cXyz::~cXyz() { +// asm cXyz::~cXyz() { +extern "C" asm void __dt__4cXyzFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__4cXyzFv.s" } @@ -1600,7 +1370,8 @@ asm void daBoomerang_c::setEffect() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +// asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__8cM3dGPlaFv.s" } @@ -1813,7 +1584,8 @@ asm daBoomerang_c::daBoomerang_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +// asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { +extern "C" asm void __dt__14dBgS_ObjGndChkFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__14dBgS_ObjGndChkFv.s" } @@ -1823,7 +1595,8 @@ asm dBgS_ObjGndChk::~dBgS_ObjGndChk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +// asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__8cM3dGCylFv.s" } @@ -1853,7 +1626,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__12dBgS_ObjAcchFv.s" } @@ -1871,7 +1645,7 @@ static asm void daBoomerang_Create(fopAc_ac_c* param_0) { #pragma pop /* 804A2718-804A271C 0046D8 0004+00 1/0 0/0 0/0 .text draw__12dDlst_base_cFv */ -void dDlst_base_c::draw() { +void draw__12dDlst_base_cFv() { /* empty function */ } @@ -1939,14 +1713,15 @@ static asm void func_804A2784() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm daBoomerang_sight_c::~daBoomerang_sight_c() { +// asm daBoomerang_sight_c::~daBoomerang_sight_c() { +extern "C" asm void __dt__19daBoomerang_sight_cFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__19daBoomerang_sight_cFv.s" } #pragma pop /* 804A27FC-804A2800 0047BC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */ -cXyz::cXyz() { +extern "C" void __ct__4cXyzFv() { /* empty function */ } @@ -1954,7 +1729,8 @@ cXyz::cXyz() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/d_a_boomerang/d_a_boomerang/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 1297281f70..149ae46ce8 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -11,15 +11,6 @@ // Types: // -struct csXyz {}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80267128 */ void atan2sX_Z() const; -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -27,45 +18,11 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct J3DModelData {}; - -struct J3DAnmTransform {}; - -struct mDoExt_bckAnm { - /* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool); - /* 8000D9CC */ void entry(J3DModelData*, f32); -}; - -struct mDoExt_baseAnm { - /* 8000D428 */ void play(); -}; - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - struct daPy_actorKeep_c { /* 8015ECB8 */ void setData(fopAc_ac_c*); /* 8015ECFC */ void clearData(); }; -struct daCrod_c { - /* 804A2E38 */ void createHeap(); - /* 804A2F18 */ void create(); - /* 804A3304 */ ~daCrod_c(); - /* 804A34B0 */ void setRoomInfo(); - /* 804A34B4 */ void setMatrix(); - /* 804A3500 */ void posMove(); - /* 804A3580 */ void setBckAnm(u16); - /* 804A35FC */ void setReturn(); - /* 804A365C */ void setLightPower(); - /* 804A36D8 */ void execute(); - /* 804A3FD4 */ void draw(); -}; - -struct J3DAnmBase {}; - struct daAlink_c { /* 8009D884 */ void getAlinkArcName(); /* 800A9248 */ void simpleAnmPlay(J3DAnmBase*); @@ -74,13 +31,6 @@ struct daAlink_c { /* 800E1A30 */ void returnCopyRod(); }; -struct dKy_tevstr_c {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - struct dRes_info_c {}; struct dRes_control_c { @@ -147,32 +97,10 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct LIGHT_INFLUENCE {}; - struct JMath { static u8 sincosTable_[65536]; }; -struct J3DModel {}; - -struct J3DAnmTextureSRTKey { - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DAnmTevRegKey { - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); -}; - -struct J3DMaterialTable { - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); -}; - -struct J3DFrameCtrl { - /* 803283FC */ void init(s16); - /* 804A329C */ ~J3DFrameCtrl(); -}; - // // Forward References: // @@ -251,11 +179,6 @@ extern "C" void searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData(); extern "C" void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData(); extern "C" void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_27(); extern "C" void _savegpr_29(); extern "C" void _restgpr_27(); @@ -271,7 +194,6 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_804A4218[4]; @@ -416,7 +338,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J3DFrameCtrl::~J3DFrameCtrl() { +// asm J3DFrameCtrl::~J3DFrameCtrl() { +extern "C" asm void __dt__12J3DFrameCtrlFv() { nofralloc #include "asm/rel/d/a/d_a_crod/d_a_crod/__dt__12J3DFrameCtrlFv.s" } diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 86c07b80e7..7e416ddff6 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -11,14 +11,6 @@ // Types: // -struct request_of_phase_process_class {}; - -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct Quaternion {}; - struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -27,211 +19,6 @@ struct mDoMtx_stack_c { static u8 now[48]; }; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; - /* 80266B84 */ void operator*(f32) const; - /* 80266F48 */ void normalizeZP(); - /* 80266FDC */ void normalizeRS(); - /* 8026706C */ bool operator!=(Vec const&) const; - /* 802670AC */ void isZero() const; - - static f32 Zero[3]; - static u8 BaseX[12]; -}; - -struct fopAcM_lc_c { - /* 8001DC68 */ void lineCheck(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct fopAcM_gc_c { - /* 8001DCBC */ void gndCheck(cXyz const*); - - static u8 mGndCheck[84]; - static f32 mGroundY; -}; - -struct daPy_py_c { - /* 8015F60C */ void wolfGrabSubjectNoDraw(fopAc_ac_c*); - /* 8015F698 */ void checkCarryStartLightBallA(); - /* 8015F730 */ void checkCarryStartLightBallB(); -}; - -struct daPy_boomerangMove_c { - /* 8015E5B0 */ void initOffset(cXyz const*); - /* 8015E654 */ void posMove(cXyz*, s16*, fopAc_ac_c*, s16); - /* 8015E87C */ void bgCheckAfterOffset(cXyz const*); -}; - -struct cBgS_PolyInfo { - /* 802680B0 */ ~cBgS_PolyInfo(); -}; - -struct daObjCarry_c { - /* 80031D10 */ void chkSaveFlag(); - /* 80031D24 */ void getPos(int); - /* 80031D38 */ void savePos(int, cXyz); - /* 80031D64 */ void onSttsFlag(int, u8); - /* 80031D78 */ void offSttsFlag(int, u8); - /* 80031D8C */ void chkSttsFlag(int, u8); - /* 80031DAC */ void setRoomNo(int, s8); - /* 80031DB8 */ void getRoomNo(int); - /* 8046F6A4 */ void data(); - /* 8046F6BC */ void getArcName(); - /* 8046F6D4 */ void getBmdName(); - /* 8046F6EC */ void checkFlag(u8); - /* 8046F724 */ void initBaseMtx(); - /* 8046F7AC */ void setBaseMtx(); - /* 8046FACC */ void preInit(); - /* 8046FB78 */ daObjCarry_c(); - /* 8046FFA4 */ void checkBreakWolfAttack(); - /* 8046FFF8 */ void checkCarryBoomerang(); - /* 80470054 */ void checkCarryHookshot(); - /* 80470080 */ void checkCarryWolf(); - /* 804700B4 */ void checkCarryOneHand(); - /* 804700F0 */ void Create(); - /* 804705DC */ void CreateInit_tsubo(); - /* 80470650 */ void CreateInit_ootubo(); - /* 80470674 */ void CreateInit_kibako(); - /* 804706D4 */ void CreateInit_ironball(); - /* 804707E0 */ void CreateInit_taru(); - /* 80470840 */ void CreateInit_dokuro(); - /* 80470890 */ void CreateInit_bokkuri(); - /* 804709DC */ void CreateInit_LightBall(); - /* 80470AB4 */ void CreateInit_Lv8Ball(); - /* 80470B5C */ void CreateHeap(); - /* 80470BF4 */ void create(); - /* 80470CF0 */ void checkCreate_LightBallA(); - /* 8047114C */ void checkCreate_LightBallB(); - /* 804715A8 */ void checkCreate_Lv8Ball(); - /* 80471680 */ void resetIconPosForLightBallA(); - /* 804716D4 */ void setIconPosForLightBallAAtR00(); - /* 804717B4 */ void setIconPosForLightBallBAtR00(); - /* 80471894 */ void resetIconPosForLightBallB(); - /* 804718E8 */ void execute(); - /* 8047233C */ void checkCulling(); - /* 80472460 */ void draw(); - /* 80472730 */ void debugDraw(); - /* 80472734 */ void _delete(); - /* 80472B54 */ void crr_pos(); - /* 80472D8C */ void check_sink(f32*); - /* 80472E5C */ void calc_gravity(); - /* 80472EF0 */ void checkRollAngle(); - /* 80473050 */ void mode_proc_call(); - /* 804733E8 */ void mode_init_wait(); - /* 804734B0 */ void mode_proc_wait(); - /* 80473718 */ void mode_init_walk(u8); - /* 804737CC */ void mode_proc_walk(); - /* 80473ED8 */ void mode_init_carry(); - /* 804741A8 */ void mode_proc_carry(); - /* 80474448 */ void mode_init_drop(u8); - /* 80474540 */ void mode_proc_drop(); - /* 80474618 */ void mode_init_float(); - /* 80474734 */ void mode_proc_float(); - /* 80474A08 */ void mode_init_sink(); - /* 80474B8C */ void mode_proc_sink(); - /* 80474D64 */ void mode_init_yogan(); - /* 80474E08 */ void mode_proc_yogan(); - /* 80474E98 */ bool mode_proc_magne(); - /* 80474EA0 */ bool mode_proc_magneCarry(); - /* 80474EA8 */ void mode_init_boomCarry(); - /* 80474FA8 */ void mode_proc_boomCarry(); - /* 80475014 */ void mode_init_growth(); - /* 804750C8 */ void mode_proc_growth(); - /* 8047515C */ bool mode_proc_end(); - /* 80475164 */ void mode_init_dbDrop(u8); - /* 80475210 */ void mode_proc_dbDrop(); - /* 80475238 */ void mode_init_hookCarry(); - /* 80475354 */ void mode_proc_hookCarry(); - /* 80475384 */ void mode_init_fit(); - /* 80475450 */ void mode_proc_fit(); - /* 80475478 */ void mode_proc_controled(); - /* 804754D0 */ void mode_init_resetLightBall(); - /* 80475598 */ void mode_proc_resetLightBall(); - /* 80475618 */ void chkSinkAll(); - /* 8047567C */ void chkWaterLineIn(); - /* 804756D4 */ void chkSinkObj(); - /* 8047573C */ void bg_check(); - /* 80476618 */ void check_bg_damage_proc_base(); - /* 80476764 */ void bg_damage_proc_kotubo(); - /* 804767C4 */ void bg_damage_proc_ootubo(); - /* 804767E4 */ void bg_damage_proc_kibako(); - /* 80476804 */ bool bg_damage_proc_ironball(); - /* 8047680C */ void bg_damage_proc_taru(); - /* 8047682C */ void bg_damage_proc_dokuro(); - /* 8047684C */ void bg_damage_proc_bokkuri(); - /* 80476930 */ bool bg_damage_proc_LightBall(); - /* 80476938 */ bool bg_damage_proc_Lv8Ball(); - /* 80476940 */ void obj_break(bool, bool, bool); - /* 80476A5C */ void check_cc_damage_proc_base(bool); - /* 80476B04 */ void cc_damage_proc_kotubo(); - /* 80476B68 */ void cc_damage_proc_ootubo(); - /* 80476B88 */ void cc_damage_proc_kibako(); - /* 80476CE4 */ void cc_damage_proc_ironball(); - /* 80476E04 */ void cc_damage_proc_taru(); - /* 80476F88 */ void cc_damage_proc_dokuro(); - /* 80476FA8 */ void cc_damage_proc_bokkuri(); - /* 804771B0 */ bool cc_damage_proc_LightBall(); - /* 804771B8 */ bool cc_damage_proc_Lv8Ball(); - /* 804771C0 */ void eff_break_tuboBmd(u16, cXyz); - /* 8047731C */ void eff_break_kibakoBmd(cXyz); - /* 8047747C */ void eff_break_tsubo(); - /* 804774D4 */ void eff_break_ootubo(); - /* 8047752C */ void eff_break_kibako(); - /* 80477574 */ void eff_break_ironball(); - /* 80477578 */ void eff_break_taru(); - /* 804775BC */ void eff_break_dokuro(); - /* 80477614 */ void eff_break_bokkuri(); - /* 80477798 */ void eff_break_kotubo2(); - /* 804777F0 */ void eff_break_LightBall(); - /* 804777F4 */ void eff_break_ootubo2(); - /* 8047784C */ void eff_break_Lv8Ball(); - /* 80477850 */ void eff_break_tsuboL8(); - /* 804778A8 */ void eff_break_ootuboL8(); - /* 80477900 */ void se_break(cBgS_PolyInfo*); - /* 80477990 */ void se_put(cBgS_PolyInfo*); - /* 80477A14 */ void se_put_water(); - /* 80477A98 */ void se_fall_water(); - /* 80477B1C */ void calc_rot_axis_base(u8); - /* 80477FE0 */ void calc_rot_axis_tsubo(); - /* 80478004 */ void calc_rot_axis_ootubo(); - /* 80478028 */ void calc_rot_axis_kibako(); - /* 8047814C */ void calc_rot_axis_ironball(); - /* 80478170 */ void calc_rot_axis_taru(); - /* 80478190 */ void calc_rot_axis_dokuro(); - /* 804781B4 */ void calc_rot_axis_bokkuri(); - /* 804783C0 */ void calc_rot_axis_kotubo2(); - /* 804783E4 */ void calc_rot_axis_LightBall(); - /* 80478408 */ void calc_rot_axis_Lv8Ball(); - /* 8047842C */ void set_wind_power(); - /* 80478808 */ void exec_proc_tsubo(); - /* 80478828 */ void exec_proc_ootubo(); - /* 80478848 */ void exec_proc_kibako(); - /* 8047884C */ void exec_proc_ironball(); - /* 804788C4 */ void exec_proc_taru(); - /* 804788C8 */ void exec_proc_dokuro(); - /* 804788CC */ void exec_proc_bokkuri(); - /* 80478C18 */ void exec_proc_LightBall(); - /* 80478CE4 */ void exec_proc_Lv8Ball(); - /* 80478D78 */ void bg_damage_proc_call(); - /* 80478F50 */ void cc_damage_proc_call(); - /* 80479128 */ void eff_break_call(); - /* 804792D4 */ void calc_rot_call(); - /* 80479480 */ void obj_execute_proc_call(); - /* 8047962C */ void setTgHitCallBack(); - /* 80479648 */ void setCoHitCallBack(); - /* 80479664 */ void CreateInitCall(); - - static u8 const mData[2072]; -}; - -struct J3DModel {}; - struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; @@ -240,40 +27,6 @@ struct dTres_c { /* 8009C3CC */ void setPosition(int, u8, Vec const*, int); }; -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; - /* 800356B4 */ void offActor(int, int); -}; - -struct dSv_event_c { - /* 8003498C */ void onEventBit(u16); - /* 800349A4 */ void offEventBit(u16); - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dStage_roomControl_c { - /* 800244E8 */ void checkRoomDisp(int) const; -}; - -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - -struct dScnKy_env_light_c { - /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); - /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct JPABaseEmitter {}; - struct dPa_modelEcallBack { /* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, u8); @@ -283,8 +36,6 @@ struct dPa_modelEcallBack { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -302,81 +53,10 @@ struct dJntCol_c { /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); }; -struct dDlst_shadowControl_c { - static u8 mSimpleTexObj[32]; -}; - -struct cCcD_Obj {}; - struct dCcMassS_Mng { /* 80085D98 */ void Set(cCcD_Obj*, u8); }; -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - -struct dCcD_SrcSph {}; - -struct dCcD_SrcCyl {}; - -struct dCcD_SrcCps {}; - -struct dCcD_Sph { - /* 80084A34 */ void Set(dCcD_SrcSph const&); -}; - -struct dCcD_GStts { - /* 80083760 */ dCcD_GStts(); - /* 80083830 */ void Move(); - /* 8046FE68 */ ~dCcD_GStts(); -}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); - /* 80084548 */ void GetTgHitGObj(); - /* 8008457C */ void GetTgHitObjSe(); - /* 800845B0 */ void getHitSeID(u8, int); - /* 80084658 */ void ChkCoHit(); -}; - -struct dCcD_GAtTgCoCommonBase { - /* 80083688 */ void GetAc(); -}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; - -struct dCcD_Cps { - /* 800847D0 */ void Set(dCcD_SrcCps const&); -}; - -struct dBgS_SplGrpChk { - /* 80078B90 */ void Set(cXyz&, f32); -}; - -struct dBgS_PolyPassChk { - /* 80078E68 */ void SetObj(); - /* 80078E74 */ void ClrObj(); - /* 80078E98 */ void SetLink(); - /* 80078F94 */ void SetIronBall(); - /* 80078FA0 */ void ClrIronBall(); -}; - -struct dBgS_ObjAcch { - /* 8046FF34 */ ~dBgS_ObjAcch(); -}; - -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 8046FEC4 */ ~dBgS_AcchCir(); -}; - struct dBgS { /* 80074B40 */ void ChkMoveBG_NoDABg(cBgS_PolyInfo const&); /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); @@ -384,64 +64,16 @@ struct dBgS { /* 80075564 */ void SplGrpChk(dBgS_SplGrpChk*); }; -struct dBgS_Acch { - /* 80075F94 */ ~dBgS_Acch(); - /* 800760A0 */ dBgS_Acch(); - /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); - /* 80076AAC */ void CrrPos(dBgS&); - /* 800773A4 */ void ClrMoveBGOnly(); -}; - -struct cM3dGSph { - /* 8026F648 */ void SetC(cXyz const&); - /* 8046FD90 */ ~cM3dGSph(); -}; - -struct cM3dGPla { - /* 8046F2F4 */ ~cM3dGPla(); -}; - -struct cM3dGCylS {}; - -struct cM3dGCyl { - /* 8026F114 */ void Set(cM3dGCylS const&); - /* 8026F1DC */ void SetC(cXyz const&); - /* 8046FDD8 */ ~cM3dGCyl(); -}; - -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026F000 */ void Set(cXyz const&, cXyz const&, f32); -}; - -struct cM3dGCir { - /* 8026EF18 */ ~cM3dGCir(); -}; - -struct cM3dGAab { - /* 8046FE20 */ ~cM3dGAab(); -}; - struct cCcS { /* 80264BA8 */ void Set(cCcD_Obj*); }; -struct cCcD_Stts { - /* 8026395C */ void ClrCcMove(); -}; - -struct cCcD_GStts { - /* 80479890 */ ~cCcD_GStts(); -}; - struct cBgS { /* 80074618 */ void GetActorPointer(int) const; /* 80074660 */ void ChkPolySafe(cBgS_PolyInfo const&); /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const; }; -struct _GXTexObj {}; - struct Z2SoundObjSimple { /* 802BE844 */ Z2SoundObjSimple(); }; @@ -462,16 +94,10 @@ struct Z2AudioMgr { static u8 mAudioMgrPtr[4 + 4 /* padding */]; }; -struct JUTNameTab { - /* 802DEAF8 */ void getName(u16) const; -}; - struct JMath { static u8 sincosTable_[65536]; }; -struct DALKMIST_INFLUENCE {}; - // // Forward References: // @@ -657,7 +283,6 @@ extern "C" extern char const* const d_a_obj_carry__stringBase0; // External References: // -extern "C" void OSReport_Error(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); @@ -796,20 +421,6 @@ extern "C" void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(); extern "C" void __ct__16Z2SoundObjSimpleFv(); extern "C" void __dl__FPv(); extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void PSMTXIdentity(); -extern "C" void PSMTXCopy(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotAxisRad(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXMultVec(); -extern "C" void PSVECAdd(); -extern "C" void PSVECScale(); -extern "C" void PSVECSquareMag(); -extern "C" void PSVECDotProduct(); -extern "C" void C_VECReflect(); -extern "C" void PSVECSquareDistance(); -extern "C" void PSQUATMultiply(); -extern "C" void C_QUATSlerp(); extern "C" void __ptmf_scall(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_23(); @@ -826,7 +437,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strcmp(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 ZeroQuat[16]; @@ -848,9 +458,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseX__4cXyz[12]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -2499,7 +2107,8 @@ static asm void bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGPla::~cM3dGPla() { +extern "C" asm void __dt__8cM3dGPlaFv() { +// asm cM3dGPla::~cM3dGPla() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGPlaFv.s" } @@ -2782,7 +2391,8 @@ asm daObjCarry_c::daObjCarry_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGSph::~cM3dGSph() { +extern "C" asm void __dt__8cM3dGSphFv() { +// asm cM3dGSph::~cM3dGSph() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGSphFv.s" } @@ -2792,7 +2402,8 @@ asm cM3dGSph::~cM3dGSph() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGCyl::~cM3dGCyl() { +extern "C" asm void __dt__8cM3dGCylFv() { +// asm cM3dGCyl::~cM3dGCyl() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGCylFv.s" } @@ -2802,7 +2413,8 @@ asm cM3dGCyl::~cM3dGCyl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cM3dGAab::~cM3dGAab() { +extern "C" asm void __dt__8cM3dGAabFv() { +// asm cM3dGAab::~cM3dGAab() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__8cM3dGAabFv.s" } @@ -2812,7 +2424,8 @@ asm cM3dGAab::~cM3dGAab() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dCcD_GStts::~dCcD_GStts() { +extern "C" asm void __dt__10dCcD_GSttsFv() { +// asm dCcD_GStts::~dCcD_GStts() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__10dCcD_GSttsFv.s" } @@ -2822,7 +2435,8 @@ asm dCcD_GStts::~dCcD_GStts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_AcchCir::~dBgS_AcchCir() { +extern "C" asm void __dt__12dBgS_AcchCirFv() { +// asm dBgS_AcchCir::~dBgS_AcchCir() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__12dBgS_AcchCirFv.s" } @@ -2832,7 +2446,8 @@ asm dBgS_AcchCir::~dBgS_AcchCir() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__12dBgS_ObjAcchFv.s" } @@ -4690,7 +4305,8 @@ static asm void daObjCarry_Create(fopAc_ac_c* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm cCcD_GStts::~cCcD_GStts() { +extern "C" asm void __dt__10cCcD_GSttsFv() { +// asm cCcD_GStts::~cCcD_GStts() { nofralloc #include "asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/__dt__10cCcD_GSttsFv.s" } diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index fd40bd4011..1cbe7b23be 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -8,38 +8,6 @@ #include "dolphin/types.h" // -// Types: -// - -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - -struct daTagMmsg_c { - /* 80D5B918 */ void create(); - /* 80D5BAB4 */ ~daTagMmsg_c(); - /* 80D5BB30 */ void execute(); -}; - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dSv_info_c { - /* 80035200 */ void onSwitch(int, int); - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -// // Forward References: // |
