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

d_a_obj_fan OK (#2109)

Browse Source 
* Change daTag_EvtArea_c::chkPointInArea to inline

* d_a_obj_fan OK
This commit is contained in:
hatal175
2024-03-26 17:57:51 -07:00
committed by GitHub
parent 7da5cdee56
commit a9d182d6cf
27 changed files with 355 additions and 1812 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.h
+31
View File
@@ -2,5 +2,36 @@
#define D_A_OBJ_FAN_H
#include "dolphin/types.h"
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor_mng.h"
struct daObjFan_c : public dBgS_MoveBgActor {
/* 80BE4D98 */ fopAc_ac_c* search_tornado();
/* 80BE4E08 */ void initBaseMtx();
/* 80BE4E44 */ void setBaseMtx();
/* 80BE4F08 */ int Create();
/* 80BE4FD4 */ int CreateHeap();
/* 80BE50EC */ int create1st();
/* 80BE519C */ int Execute(f32 (**)[3][4]);
/* 80BE538C */ void action();
/* 80BE583C */ void setCollision();
/* 80BE5960 */ int Draw();
/* 80BE5A04 */ int Delete();
u8 getType() { return fopAcM_GetParamBit(this,0,4); }
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mModel;
/* 0x5AC */ dBgW* field_0x5ac;
/* 0x5B0 */ dCcD_Stts field_0x5b0;
/* 0x5EC */ dCcD_Sph field_0x5ec[4];
/* 0xACC */ s16 field_0xacc;
/* 0xACE */ s16 field_0xace;
/* 0xAD0 */ u32 field_0xad0;
/* 0xAD4 */ u8 field_0xad4;
/* 0xAD8 */ cXyz field_0xad8;
};
#endif /* D_A_OBJ_FAN_H */
include/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.h
+31
View File
@@ -2,5 +2,36 @@
#define D_A_OBJ_TORNADO2_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
struct daObjTrnd2_c : public fopAc_ac_c {
/* 80D1C4D8 */ void setPntWind();
/* 80D1C54C */ void cutPntWind();
/* 80D1C570 */ void movePntWind();
/* 80D1C780 */ void setCpsInfo();
/* 80D1C924 */ void initBaseMtx();
/* 80D1C944 */ void setBaseMtx();
/* 80D1C98C */ void Create();
/* 80D1CC80 */ void create();
/* 80D1CDC0 */ void execute();
/* 80D1D0AC */ void setParticle();
/* 80D1D214 */ void endParticle();
/* 80D1D278 */ void startParticle();
/* 80D1D2AC */ void stopParticle();
/* 80D1D2E0 */ bool draw();
/* 80D1D2E8 */ void _delete();
f32 getTargetLength() { return field_0x738; }
f32 getNowLength() { return field_0x704; }
cXyz& getWindEndPos() { return field_0x6f4; }
u8 field_0x568[0x6f4-0x568];
cXyz field_0x6f4;
u32 field_0x700;
f32 field_0x704;
u8 field_0x708[0x738-0x708];
f32 field_0x738;
};
#endif /* D_A_OBJ_TORNADO2_H */
include/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h
+6 -2
View File
@@ -11,8 +11,12 @@ public:
/* 8048C894 */ bool Draw();
/* 8048C89C */ BOOL isDelete();
/* 8048C94C */ BOOL chkPointInArea(cXyz, cXyz);
/* 8048CD08 */ BOOL chkPointInArea(cXyz);
/* 8048CD68 */ virtual ~daTag_EvtArea_c();
/* 8048CD08 */ BOOL chkPointInArea(cXyz param_0) {
cXyz local_28;
local_28.set(0.0f, 0.0f, 0.0f);
return chkPointInArea(param_0, local_28);
}
/* 8048CD68 */ virtual ~daTag_EvtArea_c() {}
inline s32 getType();
inline u32 getOnEvtBit();