From 97969b15d2100ce42605a17fc51568ad4fb9d6e3 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Tue, 20 Dec 2022 09:24:11 -0700 Subject: [PATCH] clean up for pr --- include/f_pc/f_pc_executor.h | 6 +- include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h | 2 +- include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h | 88 +++++------ rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp | 2 +- rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp | 203 +++++++++++++++++++++++--- 5 files changed, 235 insertions(+), 66 deletions(-) diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h index fca6a858c..3a0390d7e 100644 --- a/include/f_pc/f_pc_executor.h +++ b/include/f_pc/f_pc_executor.h @@ -16,9 +16,9 @@ s32 fpcEx_Execute(base_process_class* pProc); s32 fpcEx_ToExecuteQ(base_process_class* pProc); void fpcEx_Handler(fpcLnIt_QueueFunc pFunc); -inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { - return fpcEx_Search(pFunc, pUserData); -} +// inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { +// return fpcEx_Search(pFunc, pUserData); +// } extern "C" { void fpcEx_IsExist__FUi(void); diff --git a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h index e752b8586..691283f45 100644 --- a/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h +++ b/include/rel/d/a/e/d_a_e_wb/d_a_e_wb.h @@ -154,4 +154,4 @@ private: /* 0x17E8 */ f32 mSpeedRate; }; -#endif /* D_A_E_WB_H */ +#endif /* D_A_E_WB_H */ \ No newline at end of file diff --git a/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h b/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h index 78d536328..b8f6238b9 100644 --- a/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h +++ b/include/rel/d/a/e/d_a_e_yc/d_a_e_yc.h @@ -2,9 +2,9 @@ #define D_A_E_YC_H #include "dolphin/types.h" -#include "f_op/f_op_actor.h" -#include "Z2AudioLib/Z2Creature.h" -#include "d/com/d_com_inf_game.h" +// #include "f_op/f_op_actor.h" +// #include "Z2AudioLib/Z2Creature.h" +// #include "d/com/d_com_inf_game.h" // #include "d/bg/d_bg_s_acch.h" // #include "d/cc/d_cc_d.h" @@ -75,10 +75,10 @@ // static u8 now[48]; // }; -struct daE_YC_HIO_c { - /* 807EFECC */ daE_YC_HIO_c(); - /* 807F27BC */ ~daE_YC_HIO_c(); -}; +// struct daE_YC_HIO_c { +// /* 807EFECC */ daE_YC_HIO_c(); +// /* 807F27BC */ ~daE_YC_HIO_c(); +// }; // struct dVibration_c { // /* 8006FA24 */ void StartShock(int, int, cXyz); @@ -100,42 +100,42 @@ struct daE_YC_HIO_c { // cXyz const*, f32); // }; -class e_yc_class : public fopAc_ac_c { -public: - /* 0x568 */ u8 field_0x568[80]; - /* 0x5B8 */ int field_0x5B8; - /* 0x5BC */ Z2CreatureEnemy mEnemy; - /* 0x660 */ int mAnm; - /* 0x664 */ int field_0x664; - /* 0x668 */ u8 field_0x668[6]; - /* 0x66E */ s16 mCurrentAction; - /* 0x670 */ s16 field_0x670; - /* 0x672 */ u8 field_0x672[2]; - /* 0x674 */ f32 field_0x674; - /* 0x678 */ f32 field_0x678; - /* 0x67C */ f32 field_0x67C; - /* 0x680 */ s16 field_0x680; - /* 0x682 */ u8 field_0x682[2]; - /* 0x684 */ f32 field_0x684; - /* 0x688 */ u32 field_0x688; - /* 0x68C */ u8 field_0x68C[4]; - /* 0x690 */ f32 field_0x690; - /* 0x694 */ u8 field_0x694[28]; - /* 0x69C */ f32 field_0x69C; - /* 0x6A0 */ s16 field_0x6A0; - /* 0x6A2 */ s16 field_0x6A2; - /* 0x6A4 */ s16 field_0x6A4; - /* 0x6A6 */ s16 field_0x6A6; - /* 0x6A8 */ s16 field_0x6A8; - /* 0x6AA */ s16 field_0x6AA; - /* 0x6AC */ void* field_0x6AC; - /* 0x6B0 */ u8 field_0x6B0[72]; - /* 0x6F4 */ dBgS_Acch mBgS_Acch; - /* 0x8CC */ u8 field_0x8CC[28]; - /* 0x8E8 */ dCcD_GStts mCcD_GStts; - /* 0x908 */ dCcD_GObjInf mCcD_GObjInf; - /* 0xA0C */ u8 field_0xA0C[364]; - /* 0xB78 */ cCcD_Obj* mpTgHitObj; -}; +// class e_yc_class : public fopAc_ac_c { +// public: +// /* 0x568 */ u8 field_0x568[80]; +// /* 0x5B8 */ int field_0x5B8; +// /* 0x5BC */ Z2CreatureEnemy mEnemy; +// /* 0x660 */ int mAnm; +// /* 0x664 */ int field_0x664; +// /* 0x668 */ u8 field_0x668[6]; +// /* 0x66E */ s16 mCurrentAction; +// /* 0x670 */ s16 field_0x670; +// /* 0x672 */ u8 field_0x672[2]; +// /* 0x674 */ f32 field_0x674; +// /* 0x678 */ f32 field_0x678; +// /* 0x67C */ f32 field_0x67C; +// /* 0x680 */ s16 field_0x680; +// /* 0x682 */ u8 field_0x682[2]; +// /* 0x684 */ f32 field_0x684; +// /* 0x688 */ u32 field_0x688; +// /* 0x68C */ u8 field_0x68C[4]; +// /* 0x690 */ f32 field_0x690; +// /* 0x694 */ u8 field_0x694[28]; +// /* 0x69C */ f32 field_0x69C; +// /* 0x6A0 */ s16 field_0x6A0; +// /* 0x6A2 */ s16 field_0x6A2; +// /* 0x6A4 */ s16 field_0x6A4; +// /* 0x6A6 */ s16 field_0x6A6; +// /* 0x6A8 */ s16 field_0x6A8; +// /* 0x6AA */ s16 field_0x6AA; +// /* 0x6AC */ void* field_0x6AC; +// /* 0x6B0 */ u8 field_0x6B0[72]; +// /* 0x6F4 */ dBgS_Acch mBgS_Acch; +// /* 0x8CC */ u8 field_0x8CC[28]; +// /* 0x8E8 */ dCcD_GStts mCcD_GStts; +// /* 0x908 */ dCcD_GObjInf mCcD_GObjInf; +// /* 0xA0C */ u8 field_0xA0C[364]; +// /* 0xB78 */ cCcD_Obj* mpTgHitObj; +// }; #endif /* D_A_E_YC_H */ diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index fc951ee7e..555b3033c 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -5180,4 +5180,4 @@ static u8 data_807E3900[4]; static u8 data_807E3904[4]; #pragma pop -/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 807E2F0C-807E2F0C 000580 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file diff --git a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp index 2ed1d13fe..a601674aa 100644 --- a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp +++ b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp @@ -7,6 +7,180 @@ #include "dol2asm.h" #include "dolphin/types.h" +// +// Types: +// + +struct request_of_phase_process_class {}; + +struct mDoMtx_stack_c { + /* 8000CE38 */ void scaleM(f32, f32, f32); + + static u8 now[48]; +}; + +struct mDoExt_McaMorfCallBack2_c {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + +struct J3DModelData {}; + +struct Z2Creature {}; + +struct mDoExt_McaMorfSO { + /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, + mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, + int, Z2Creature*, u32, u32); + /* 80010E70 */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32); + /* 800110B0 */ void play(u32, s8); + /* 800111C0 */ void entryDL(); + /* 800111EC */ void modelCalc(); + /* 80011310 */ void stopZelAnime(); +}; + +struct fopAc_ac_c { + /* 80018B64 */ fopAc_ac_c(); +}; + +struct e_yc_class {}; + +struct daE_YC_HIO_c { + /* 807EFECC */ daE_YC_HIO_c(); + /* 807F27BC */ ~daE_YC_HIO_c(); +}; + +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; +}; + +struct dVibration_c { + /* 8006FA24 */ void StartShock(int, int, cXyz); +}; + +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 { + /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); +}; + +struct dPa_levelEcallBack {}; + +struct csXyz {}; + +struct _GXColor {}; + +struct dPa_control_c { + struct level_c { + /* 8004B918 */ void getEmitter(u32); + }; + + /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); + /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, + cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, + _GXColor const*, cXyz const*, f32); + /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, + u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, + cXyz const*, f32); +}; + +struct dDlst_shadowControl_c { + static u8 mSimpleTexObj[32]; +}; + +struct dCcD_Stts { + /* 80083860 */ void Init(int, int, fopAc_ac_c*); +}; + +struct dCcD_SrcSph {}; + +struct dCcD_Sph { + /* 80084A34 */ void Set(dCcD_SrcSph const&); +}; + +struct dCcD_GStts { + /* 80083760 */ dCcD_GStts(); + /* 80083830 */ void Move(); +}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 80084460 */ void ChkTgHit(); + /* 800844F8 */ void GetTgHitObj(); +}; + +struct dBgS_PolyPassChk { + /* 80078E68 */ void SetObj(); +}; + +struct dBgS_ObjAcch { + /* 807F274C */ ~dBgS_ObjAcch(); +}; + +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); +}; + +struct dBgS {}; + +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&); +}; + +struct cM3dGSph { + /* 8026F648 */ void SetC(cXyz const&); + /* 8026F708 */ void SetR(f32); + /* 807F26BC */ ~cM3dGSph(); +}; + +struct cM3dGAab { + /* 807F2704 */ ~cM3dGAab(); +}; + +struct cCcD_Obj {}; + +struct cCcS { + /* 80264BA8 */ void Set(cCcD_Obj*); +}; + +struct cBgS_PolyInfo {}; + +struct _GXTexObj {}; + +struct Z2CreatureEnemy { + /* 802C0F64 */ Z2CreatureEnemy(); + /* 802C1094 */ void init(Vec*, Vec*, u8, u8); + /* 802C1B7C */ void setLinkSearch(bool); + /* 802C1B90 */ void setEnemyName(char const*); +}; + +struct JGeometry { + template + struct TVec3 {}; + /* TVec3 */ + struct TVec3__template0 {}; +}; + +struct J3DModel {}; + +struct J3DFrameCtrl { + /* 8032842C */ void checkPass(f32); +}; + // // Forward References: // @@ -108,6 +282,11 @@ extern "C" void setEnemyName__15Z2CreatureEnemyFPCc(); extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void checkPass__12J3DFrameCtrlFf(); +extern "C" void PSMTXCopy(); +extern "C" void PSMTXTrans(); +extern "C" void PSMTXMultVec(); +extern "C" void PSVECAdd(); +extern "C" void PSVECSquareMag(); extern "C" void _savegpr_24(); extern "C" void _savegpr_25(); extern "C" void _savegpr_27(); @@ -119,15 +298,19 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* g_fopAc_Method[8]; +extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__8dCcD_Sph[36]; extern "C" extern void* __vt__9dCcD_Stts[11]; extern "C" extern void* __vt__12cCcD_SphAttr[25]; extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; -// extern "C" extern u8 g_dComIfG_gameInfo[122384]; +extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -// extern "C" extern void* calc_mtx[1 + 1 /* padding */]; +extern "C" extern u8 g_env_light[4880]; +extern "C" extern u8 j3dSys[284]; +extern "C" extern void* calc_mtx[1 + 1 /* padding */]; +extern "C" extern u32 __float_nan; extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); @@ -330,19 +513,6 @@ static asm void daE_YC_Draw(e_yc_class* param_0) { #pragma pop /* 807F00BC-807F01AC 0002DC 00F0+00 1/1 0/0 0/0 .text damage_check__FP10e_yc_class */ -#ifdef NONMATCHING -static void damage_check(e_yc_class* param_0) { - param_0->mCcD_GStts.Move(); - fopAc_ac_c* player = dComIfGp_getPlayer(0); - if (param_0->field_0x6AA == 0 && !param_0->mCcD_GObjInf.ChkTgHit()) { - param_0->mpTgHitObj = param_0->mCcD_GObjInf.GetTgHitObj(); - - if (((daAlink_c*)player)->getCutType() != 0x2c) { - return; - } - } -} -#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -351,7 +521,6 @@ static asm void damage_check(e_yc_class* param_0) { #include "asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/damage_check__FP10e_yc_class.s" } #pragma pop -#endif /* ############################################################################################## */ /* 807F2878-807F287C 000014 0004+00 0/2 0/0 0/0 .rodata @3859 */ @@ -920,4 +1089,4 @@ static asm void func_807F2848() { } #pragma pop -/* 807F294C-807F294C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 807F294C-807F294C 0000E8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file