Obj_Oiltubo done (#2071)

This commit is contained in:
TakaRikka
2024-02-14 15:11:05 -08:00
committed by GitHub
parent e1c5bdb539
commit 101223804a
46 changed files with 532 additions and 2822 deletions
+1 -1
View File
@@ -498,7 +498,7 @@ public:
void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); }
void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); }
void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); }
void SetAtSprm(u32 prm) { mObjAt.SetSPrm(prm); }
void SetAtSPrm(u32 prm) { mObjAt.SetSPrm(prm); }
void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); }
void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); }
void ClrAtHit() { mObjAt.ClrHit(); }
@@ -1,6 +1,23 @@
#ifndef D_A_OBJ_LV3WATERB_H
#define D_A_OBJ_LV3WATERB_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class obj_lv3WaterB_class : public fopAc_ac_c {
public:
/* 0x568 */ request_of_phase_process_class mBWaterPhase;
/* 0x570 */ request_of_phase_process_class mOcthibiPhase;
/* 0x578 */ J3DModel* mpBWaterModel;
/* 0x57C */ mDoExt_btkAnm* mpBWaterBtk;
/* 0x580 */ J3DModel* mpOctHibiModel;
/* 0x584 */ s16 mAction;
/* 0x586 */ s16 field_0x586;
/* 0x588 */ u8 field_0x588[0x58C - 0x588];
/* 0x58C */ Mtx mpBWaterMtx;
/* 0x5BC */ dBgW* mpBWaterBgW;
/* 0x5C0 */ u8 field_0x5C0[0x5C4 - 0x5C0];
/* 0x5C4 */ Mtx mpOctHibiMtx;
/* 0x5F4 */ dBgW* mpOctHibiBgW;
};
#endif /* D_A_OBJ_LV3WATERB_H */
@@ -1,6 +1,51 @@
#ifndef D_A_OBJ_OILTUBO_H
#define D_A_OBJ_OILTUBO_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daObj_Oiltubo_c : public fopAc_ac_c {
public:
typedef int (daObj_Oiltubo_c::*processFn)(void*);
/* 80CA6718 */ int create();
/* 80CA6B28 */ int CreateHeap();
/* 80CA6C5C */ int Delete();
/* 80CA6CA0 */ int Execute();
/* 80CA6EDC */ int Draw();
/* 80CA6FC8 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80CA6FE8 */ const char* getResName();
/* 80CA6FF8 */ void restart();
/* 80CA7068 */ void initialize();
/* 80CA720C */ int setProcess(processFn);
/* 80CA72BC */ void setParam();
/* 80CA7318 */ void setEnvTevColor();
/* 80CA7374 */ void setRoomNo();
/* 80CA73B8 */ void setMtx();
/* 80CA7430 */ void setAttnPos();
/* 80CA7478 */ BOOL chkEvent();
/* 80CA74C8 */ int wait(void*);
static const dCcD_SrcGObjInf mCcDObjInfo;
static dCcD_SrcCyl mCcDCyl;
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ J3DModel* mpBModel;
/* 0x578 */ mDoExt_btkAnm mBtk;
/* 0x590 */ dBgS_ObjAcch mAcch;
/* 0x768 */ dCcD_Stts mCcStts;
/* 0x7A4 */ dBgS_AcchCir mAcchCir;
/* 0x7E4 */ dCcD_Cyl mCcAtCyl;
/* 0x920 */ dCcD_Cyl mCcCoCyl;
/* 0xA5C */ cBgS_GndChk mGroundChk;
/* 0xA98 */ processFn mProcess;
/* 0xAA4 */ Z2SoundObjSimple mSound;
/* 0xAC4 */ f32 mGroundHeight;
/* 0xAC8 */ u32 mShadowKey;
/* 0xACC */ u16 mMode;
/* 80CA7628 */ virtual ~daObj_Oiltubo_c() {}
};
#endif /* D_A_OBJ_OILTUBO_H */