d_a_obj_swspinner OK, d_a_obj_lv4gear OK (#1931)

This commit is contained in:
hev7
2023-09-16 18:22:57 +01:00
committed by GitHub
parent db8063f99a
commit aec4fa0e4f
32 changed files with 415 additions and 1866 deletions
+9 -1
View File
@@ -2,9 +2,9 @@
#define D_A_SPINNER_H
#include "d/com/d_com_inf_game.h"
#include "d/d_path.h"
#include "d/particle/d_particle_copoly.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_path.h"
class daSpinner_c : public fopAc_ac_c {
public:
@@ -61,6 +61,12 @@ public:
field_0xaa4 = param_0;
}
void offSpinnerTag() {
if (mSpinnerTag != 0) {
mSpinnerTag = 5;
}
}
bool reflectAccept() {
bool accept = false;
if (!mBck.isStop() && mSpinnerTag == 0) {
@@ -72,6 +78,8 @@ public:
MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
s16 getAngleY() { return shape_angle.y + field_0xa7e; }
private:
/* 0x568 */ J3DModel* mpModel;
/* 0x56C */ mDoExt_bckAnm mBck;
@@ -1,6 +1,37 @@
#ifndef D_A_OBJ_LV4GEAR_H
#define D_A_OBJ_LV4GEAR_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.h"
class daObjLv4Gear_c : public fopAc_ac_c {
public:
enum gear_type_e {
GEAR_S_e,
GEAR_L_e,
};
/* 80C67FB4 */ void initBaseMtx();
/* 80C67FF0 */ void setBaseMtx();
/* 80C68050 */ int Create();
/* 80C680A4 */ int CreateHeap();
/* 80C68124 */ int create();
/* 80C681F4 */ int execute();
/* 80C683E0 */ int draw();
/* 80C68444 */ int _delete();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getType() { return fopAcM_GetParamBit(this, 8, 4); }
u8 checkSE() { return fopAcM_GetParamBit(this, 12, 4); }
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ s16 mTarget;
/* 0x576 */ s16 mSpeed;
/* 0x578 */ s16 field_0x578;
/* 0x57C */ int mProcID;
/* 0x580 */ u16 mCount;
/* 0x582 */ u8 mType;
};
#endif /* D_A_OBJ_LV4GEAR_H */
@@ -1,6 +1,39 @@
#ifndef D_A_OBJ_SWSPINNER_H
#define D_A_OBJ_SWSPINNER_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/bg/d_bg_w.h"
#include "f_op/f_op_actor_mng.h"
#include "rel/d/a/d_a_spinner/d_a_spinner.h"
class daObjSwSpinner_c : public dBgS_MoveBgActor {
public:
/* 80D00174 */ void initBaseMtx();
/* 80D001CC */ void setBaseMtx();
/* 80D00284 */ int Create();
/* 80D0035C */ int CreateHeap();
/* 80D00498 */ int create1st();
/* 80D00518 */ int Execute(Mtx**);
/* 80D00890 */ int Draw();
/* 80D00954 */ int Delete();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
int GetRotSpeedY() { return mRotSpeedY; }
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel1;
/* 0x5AC */ J3DModel* mpModel2;
/* 0x5B0 */ dBgW* mpBgW2;
/* 0x5B4 */ Mtx mMtx;
/* 0x5E4 */ f32 field_0x5e4;
/* 0x5E8 */ u8 field_0x5e8;
/* 0x5E9 */ u8 field_0x5e9;
/* 0x5EA */ u8 field_0x5ea;
/* 0x5EB */ u8 field_0x5eb;
/* 0x5EC */ s16 mShapeAngleY;
/* 0x5EE */ s16 mRotSpeedY;
/* 0x5F0 */ s16 mCount;
}; // Size: 0x5F4
#endif /* D_A_OBJ_SWSPINNER_H */