clean up for pr

This commit is contained in:
Pheenoh
2022-12-20 16:30:01 -07:00
parent 1775ce443c
commit 97969b15d2
5 changed files with 235 additions and 66 deletions
+3 -3
View File
@@ -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);
+1 -1
View File
@@ -154,4 +154,4 @@ private:
/* 0x17E8 */ f32 mSpeedRate;
};
#endif /* D_A_E_WB_H */
#endif /* D_A_E_WB_H */
+44 -44
View File
@@ -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 */