Skip to content

Commit

Permalink
d_a_obj_vgnfd work
Browse files Browse the repository at this point in the history
  • Loading branch information
magcius committed Sep 1, 2024
1 parent f2d1157 commit 4d5aeee
Show file tree
Hide file tree
Showing 4 changed files with 466 additions and 57 deletions.
47 changes: 37 additions & 10 deletions include/d/actor/d_a_obj_vgnfd.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,55 @@
#define D_A_OBJ_VGNFD_H

#include "f_op/f_op_actor.h"
#include "d/d_particle.h"
#include "m_Do/m_Do_ext.h"
#include "SSystem/SComponent/c_phase.h"

class J3DModel;
class dBgW;

class daObjVgnfd_c : public fopAc_ac_c {
public:
void check_boss(int) {}
void check_ev_init(int); // weak but not inlined?
BOOL check_ev_init(int); // weak but not inlined?
void on_door_ev(int) {}

void solidHeapCB(fopAc_ac_c*);
void create_bdl_brk(int);
void create_heap();
static BOOL solidHeapCB(fopAc_ac_c*);
BOOL create_bdl_brk(int);
BOOL create_heap();
s32 _create();
BOOL _delete();
void get_start_demo_idx();
void check_fin();
bool _delete();
s32 get_start_demo_idx();
BOOL check_fin();
void on_fin();
void init_mtx();
void set_timer();
BOOL _execute();
BOOL _draw();
bool _execute();
bool _draw();

public:
static const s32 M_bdl_table[];
static const s32 M_brk_table[];
static const s32 M_door_bdl_table[];
static const u16 M_door_ev_table[];
static const u16 M_boss_ev_table[];
static const char M_arcname[];

public:
/* Place member variables here */
/* 0x290 */ J3DModel* mModel[5];
/* 0x2A4 */ J3DModel* mModel2[2];
/* 0x2AC */ mDoExt_btkAnm mBtkAnm;
/* 0x2C0 */ request_of_phase_process_class mPhs;
/* 0x2C8 */ mDoExt_brkAnm mBrkAnm[5];
/* 0x340 */ dPa_smokeEcallBack mSmoke;
/* 0x360 */ s32 mStaffId;
/* 0x364 */ s32 mTimer;
/* 0x368 */ s32 M_demo_idx;
/* 0x36C */ s32 mCurModel;
/* 0x370 */ s16 mEventIdx;
/* 0x372 */ u8 mState;
/* 0x373 */ bool mInit;
/* 0x374 */ dBgW* M_bgw;
};

#endif /* D_A_OBJ_VGNFD_H */
27 changes: 10 additions & 17 deletions src/d/actor/d_a_bita.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,16 @@
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"

static f32 dummy[3] = {1.0f, 1.0f, 1.0f};
static f32 dummy2[3] = {1.0f, 1.0f, 1.0f};
// I suspect this is HIO data.
struct _dummy {
u8 field_0x00;
u8 field_0x01;
u8 field_0x02;
u8 field_0x03;
f32 field_0x04;
f32 field_0x08;
f32 field_0x0c;
f32 field_0x10;
f32 field_0x14;
} dummy3 = {
0x02, 0x00, 0x02, 0x01,
0.0f, 2.125f, 0.0f, 1.75f, 0.0f,
};
static Vec dummy1 = { 1.0f, 1.0f, 1.0f };
static Vec dummy2 = { 1.0f, 1.0f, 1.0f };
static struct {
u32 m0;
f32 m1;
f32 m2;
f32 m3;
f32 m4;
f32 m5;
} dummy3 = { 0x02000201, 0.0f, 2.125f, 0.0f, 1.75f, 0.0f };

static btd_class* btd = NULL;

Expand Down
Loading

0 comments on commit 4d5aeee

Please sign in to comment.