Skip to content

Commit 57fe6dc

Browse files
authored
d_a_obj_burnbox matching (#2331)
* initial work * d_a_obj_burnbox, matching * renamed varia bles and additional cleanup * assigned correct comments to models' name * post review changes * if statement separation in Execute method
1 parent d3e9175 commit 57fe6dc

File tree

3 files changed

+181
-244
lines changed

3 files changed

+181
-244
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ def MatchingFor(*versions):
14541454
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag04"),
14551455
ActorRel(MatchingFor("GZ2E01"), "d_a_kytag17"),
14561456
ActorRel(NonMatching, "d_a_obj_brakeeff"),
1457-
ActorRel(NonMatching, "d_a_obj_burnbox"),
1457+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_burnbox"),
14581458
ActorRel(NonMatching, "d_a_obj_carry"),
14591459
ActorRel(NonMatching, "d_a_obj_ito"),
14601460
ActorRel(NonMatching, "d_a_obj_movebox"),

include/d/actor/d_a_obj_burnbox.h

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef D_A_OBJ_BURNBOX_H
22
#define D_A_OBJ_BURNBOX_H
33

4+
#include "d/d_bg_s_movebg_actor.h"
5+
#include "d/d_cc_d.h"
46
#include "f_op/f_op_actor_mng.h"
57

68
/**
@@ -11,26 +13,33 @@
1113
* @details
1214
*
1315
*/
14-
class daObjBurnBox_c : public fopAc_ac_c {
16+
class daObjBurnBox_c : public dBgS_MoveBgActor {
1517
public:
1618
/* 8046E698 */ void initBaseMtx();
1719
/* 8046E6D4 */ void setBaseMtx();
18-
/* 8046E738 */ void Create();
19-
/* 8046E8BC */ void CreateHeap();
20-
/* 8046E93C */ void create1st();
21-
/* 8046E9EC */ void Execute(f32 (**)[3][4]);
22-
/* 8046EABC */ void Draw();
23-
/* 8046EC10 */ void Delete();
20+
/* 8046E738 */ int Create();
21+
/* 8046E8BC */ int CreateHeap();
22+
/* 8046E93C */ cPhs__Step create1st();
23+
/* 8046E9EC */ int Execute(Mtx**);
24+
/* 8046EABC */ int Draw();
25+
/* 8046EC10 */ int Delete();
2426

25-
static void make_prm_burnBox(u32* param_0, u8 param_1) {
26-
*param_0 = param_1;
27-
}
27+
static void make_prm_burnBox(u32* param_0, u8 param_1) { *param_0 = param_1; }
28+
29+
u8 getType() { return fopAcM_GetParamBit(this, 0, 8); }
2830

2931
private:
30-
/* 0x568 */ u8 field_0x568[0x740 - 0x568];
32+
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
33+
/* 0x5A8 */ J3DModel* mpBoxModel;
34+
/* 0x5AC */ dCcD_Stts mStts;
35+
/* 0x5E8 */ dCcD_Cyl mCyl;
36+
/* 0x724 */ u32 field_0x724;
37+
/* 0x728 */ s16 field_0x728;
38+
/* 0x72a */ u8 field_0x72a;
39+
/* 0x72b */ u8 field_0x72b;
40+
/* 0x72c */ JPABaseEmitter* mpEmitters[5];
3141
};
3242

3343
STATIC_ASSERT(sizeof(daObjBurnBox_c) == 0x740);
3444

35-
3645
#endif /* D_A_OBJ_BURNBOX_H */

0 commit comments

Comments
 (0)