obj_magLiftRot mostly done, obj_suisya / obj_tgake OK (#1895)

* obj_magLiftRot mostly done, obj_suisya / obj_tgake OK

* remove asm
This commit is contained in:
TakaRikka
2023-08-24 12:05:11 +03:00
committed by GitHub
parent eba4ca3b13
commit 775667ef1e
48 changed files with 805 additions and 1880 deletions
@@ -1,6 +1,7 @@
#ifndef D_A_OBJ_MAGLIFTROT_H
#define D_A_OBJ_MAGLIFTROT_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_MAGLIFTROT_H */
@@ -1,6 +1,22 @@
#ifndef D_A_OBJ_SUISYA_H
#define D_A_OBJ_SUISYA_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/bg/d_bg_s_acch.h"
class daObj_Suisya_c : public fopAc_ac_c {
public:
/* 80CF0078 */ int draw();
/* 80CF0168 */ int execute();
/* 80CF0234 */ int _delete();
/* 80CF0284 */ int CreateHeap();
/* 80CF0310 */ int create();
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ u32 mShadowKey;
/* 0x578 */ dBgS_AcchCir mAcchCir;
/* 0x5B8 */ dBgS_ObjAcch mAcch;
};
#endif /* D_A_OBJ_SUISYA_H */
@@ -1,6 +1,30 @@
#ifndef D_A_OBJ_TGAKE_H
#define D_A_OBJ_TGAKE_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/bg/d_bg_s_movebg_actor.h"
class daObjGake_c : public dBgS_MoveBgActor {
public:
/* 80D0BC18 */ void initBaseMtx();
/* 80D0BC54 */ void setBaseMtx();
/* 80D0BDA0 */ int create1st();
/* 80D0BD30 */ virtual int CreateHeap();
/* 80D0BCB8 */ virtual int Create();
/* 80D0BE24 */ virtual int Execute(Mtx**);
/* 80D0BF7C */ virtual int Draw();
/* 80D0C034 */ virtual int Delete();
u16 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); }
u16 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); }
u8 getType() { return fopAcM_GetParamBit(this, 0x14, 8); }
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u16 mEventBit1;
/* 0x5AE */ u16 mEventBit2;
/* 0x5B0 */ u8 mHide;
};
#endif /* D_A_OBJ_TGAKE_H */