mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-22 06:20:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_lbridge (#622)

Browse Source 
* Started working on d_a_lbridge

* Implemented CheckCreateHeap in d_a_lbridge

* Added member variables for d_a_lbridge

* Implemented daLbridge_c::set_mtx

* Implemented daLbridge_c::setMoveBGMtx

* Implemented se functions in d_a_lbridge

* Implemented daLbridge_c::demo

* Implemented daLbridge_c::_create

* Refactored daLbridge_c::_create

* Added constructor for mDoExt_bpkAnm

* daLbridge_c::_draw

* daLbridge_c::_execute match

* daLbridge_c::CreateInit

* daLbridge_c::sw_check match

* daLbridge_c::appear_bridge

* daLbridge_c::CreateHeap

* daLbridge_c::_delete match

* daLbridge_c::disappear_bridge match

* d_a_lbridge fixes

* d_a_lbridge matching

* Removed old comments

* d_a_lbridge variable renaming

* d_a_lbridge PR fixes
This commit is contained in:
Daniel Hajjar
2024-05-01 22:04:57 +02:00
committed by GitHub
parent f9a8f92a15
commit e7e5ea2071
4 changed files with 279 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_lbridge.h
+24 -2
View File
@@ -1,13 +1,14 @@
#ifndef D_A_LBRIDGE_H
#define D_A_LBRIDGE_H
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor.h"
class daLbridge_c : public fopAc_ac_c {
public:
inline BOOL _delete();
void CreateHeap();
BOOL CreateHeap();
void CreateInit();
s32 _create();
void set_mtx();
@@ -21,8 +22,29 @@ public:
void set_off_se();
BOOL _draw();
static const char m_arcname[];
public:
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel* mpModel;
/* 0x29C */ dBgW* mpBgW;
/* 0x2A0 */ Mtx mMtx;
/* 0x2D0 */ mDoExt_btkAnm mBtkAnm;
/* 0x2E4 */ mDoExt_bpkAnm mBpkAnm;
/* 0x2F8 */ mDoExt_brkAnm mBrkAnm;
/* 0x310 */ JPABaseEmitter* mpEmitter;
/* 0x314 */ s32 mSwitchNo;
/* 0x318 */ s16 mAppearEventIdx;
/* 0x31A */ s16 mDisappearEventIdx;
/* 0x31C */ s16 unk31C;
/* 0x31E */ u8 mTimer;
/* 0x31F */ u8 mIsSw;
};
namespace daLbridge_prm {
inline u8 getSwitchNo(daLbridge_c* ac) {
return (fopAcM_GetParam(ac) >> 0) & 0xFF;
}
}; // namespace daLbridge_prm
#endif /* D_A_LBRIDGE_H */
include/m_Do/m_Do_ext.h
+3
View File
@@ -154,12 +154,15 @@ private:
class mDoExt_bpkAnm : public mDoExt_baseAnm {
public:
mDoExt_bpkAnm() { field_0xc = NULL; }
int init(J3DModelData*, J3DAnmColor*, int, int, f32, s16, s16, bool, int);
int init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16, bool, int);
void entry(J3DModelData*, f32);
void entry(J3DMaterialTable*, f32);
void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
private:
/* 0x08 */ J3DAnmColor* mpAnm;
/* 0x0C */ J3DMatColorAnm* field_0xc;