encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

obj_geyer and obj_ktOnFire done (#2619)

Browse Source 
* obj_geyer and obj_ktOnFire done

* pr
This commit is contained in:
TakaRikka
2025-08-31 01:10:43 +03:00
committed by GitHub
parent 5d46f1fc22
commit 2036d9c34f
9 changed files with 7388 additions and 4149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_geyser.h
+42 -8
View File
@@ -2,6 +2,8 @@
#define D_A_OBJ_GEYSER_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
/**
* @ingroup actors-objects
@@ -11,14 +13,11 @@
* @details
*
*/
class daObjGeyser_c : public fopAc_ac_c {
class daObjGeyser_c : public dBgS_MoveBgActor {
public:
/* 80BF6F18 */ void initBaseMtx();
/* 80BF6F38 */ void setBaseMtx();
/* 80BF6F80 */ void Create();
/* 80BF70E0 */ void CreateHeap();
/* 80BF7174 */ void create1st();
/* 80BF7288 */ void Execute(f32 (**)[3][4]);
/* 80BF7174 */ int create1st();
/* 80BF744C */ void action();
/* 80BF75B8 */ void actionOff2Init();
/* 80BF75C4 */ void actionOff2();
@@ -37,7 +36,6 @@ public:
/* 80BF8584 */ void setPntWind();
/* 80BF863C */ void cutPntWind();
/* 80BF8660 */ void movePntWind();
/* 80BF8870 */ void Draw();
/* 80BF8914 */ void setEmitterPre00();
/* 80BF89AC */ void setEmitterSrc00Sand();
/* 80BF89B0 */ void setEmitterSrc01Smk();
@@ -50,10 +48,46 @@ public:
/* 80BF8CA0 */ void stopEmitterClm00();
/* 80BF8CCC */ void stopEmitterSmk01();
/* 80BF8CF8 */ void stopEmitterSmk02();
/* 80BF8D24 */ void Delete();
/* 80BF70E0 */ virtual int CreateHeap();
/* 80BF6F80 */ virtual int Create();
/* 80BF7288 */ virtual int Execute(Mtx**);
/* 80BF8870 */ virtual int Draw();
/* 80BF8D24 */ virtual int Delete();
u8 getType() { return (field_0x766 >> 8) & 0xF; }
u8 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getArg1() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getArg2() { return fopAcM_GetParamBit(this, 16, 8); }
u8 getArg3() { return fopAcM_GetParamBit(this, 24, 8); }
u8 getSwNo() { return 0xFF; }
private:
/* 0x568 */ u8 field_0x568[0x7f0 - 0x568];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dCcD_Stts mCcStts;
/* 0x5E8 */ dCcD_Cps mCcCps;
/* 0x72C */ u8 field_0x72C[0x730 - 0x72C];
/* 0x730 */ f32 field_0x730;
/* 0x734 */ u8 field_0x734[0x744 - 0x734];
/* 0x744 */ cM3dGCpsS mCpsSrc;
/* 0x760 */ u16 field_0x760;
/* 0x762 */ u8 mAction;
/* 0x763 */ u8 field_0x763;
/* 0x764 */ u8 mIsPrmInit;
/* 0x766 */ u16 field_0x766;
/* 0x768 */ u16 field_0x768;
/* 0x76C */ JPABaseEmitter* mpEmitterClm00;
/* 0x770 */ JPABaseEmitter* mpEmitterSmk01;
/* 0x774 */ JPABaseEmitter* mpEmitterSmk02;
/* 0x778 */ JPABaseEmitter* mpEmitterPre00;
/* 0x77C */ JPABaseEmitter* mpEmitterSrc00Sand;
/* 0x780 */ JPABaseEmitter* mpEmitterSrc01Smk;
/* 0x784 */ u8 field_0x784;
/* 0x785 */ u8 field_0x785;
/* 0x788 */ cXyz mParticleScale;
/* 0x794 */ WIND_INFLUENCE mWind;
/* 0x7C0 */ Mtx mMtx;
};
STATIC_ASSERT(sizeof(daObjGeyser_c) == 0x7f0);
include/d/actor/d_a_obj_ktOnFire.h
+12 -19
View File
@@ -2,6 +2,7 @@
#define D_A_OBJ_KTONFIRE_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
/**
* @ingroup actors-objects
@@ -14,7 +15,7 @@
class daKtOnFire_c : public fopAc_ac_c {
public:
/* 8058C678 */ void setBaseMtx();
/* 8058C6D0 */ void create();
/* 8058C6D0 */ int create();
/* 8058C960 */ void lightInit();
/* 8058C9D4 */ void setLight();
/* 8058C9F8 */ void cutLight();
@@ -22,31 +23,23 @@ public:
/* 8058CDF8 */ int Draw();
/* 8058CE00 */ int Delete();
static u8 const mCcDObjInfo[48];
static u8 mCcDCyl[68];
static const dCcD_SrcGObjInf mCcDObjInfo;
static dCcD_SrcCyl mCcDCyl;
private:
/* 0x568 */ u8 field_0x568[0x6E4 - 0x568];
/* 0x568 */ dCcD_Stts mCcStts;
/* 0x5A4 */ dCcD_Cyl mCcCyl;
/* 0x6E0 */ u8 mWaitTime;
/* 0x6E1 */ u8 mIsSwitch;
/* 0x6E2 */ u8 field_0x6e2;
/* 0x6E4 */ cXyz mTorchPos;
/* 0x6F0 */ u8 field_0x6E4[0x6FC - 0x6F0];
/* 0x6F0 */ u32 field_0x6f0;
/* 0x6F4 */ u32 field_0x6f4;
/* 0x6F8 */ u32 field_0x6f8;
/* 0x6FC */ cXyz mLightPos;
/* 0x708 */ LIGHT_INFLUENCE mLight;
};
STATIC_ASSERT(sizeof(daKtOnFire_c) == 0x728);
class daKtOnFire_HIO_c : public mDoHIO_entry_c {
public:
/* 8058C60C */ daKtOnFire_HIO_c();
/* 8058CEA8 */ ~daKtOnFire_HIO_c() {}
void genMessage(JORMContext*);
u8 mTimer;
u8 mColor1R;
u8 mColor1G;
u8 mColor1B;
};
#endif /* D_A_OBJ_KTONFIRE_H */
include/d/d_particle_name.h
+3216 -3205
View File
File diff suppressed because it is too large Load Diff