mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-03 08:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_lv3Candle OK (#2093)

Browse Source 
* All methods matching

* Some cleanup, stuck on TU match

* d_a_obj_heavySw OK (#2091)

* match functions

* Match TU

* Cleanup

* remove asm and update progress

* d_a_obj_sekizo OK (#2092)

* Test commit.

* Match initBaseMtx and setBaseMtx

* Match Create, Draw. Execute almost matched.

* Match Execute and simpler functions.

* Misc changes for pause.

* Match CreateHeap and Delete. Start cleanup.

* Match create(). Update inherited fopAc_ac_c members.

* Most of sekizo matched, but .data has extra zeros (param_c underutilized?).

* Minor cleanup.

* Remove unused asm and update progress.

* Fix progress.

* Casting and cullMtx feedback.

* Decomp OK, minor cleanup

* Updating progress

---------

Co-authored-by: GinNoOokami <noreply>
Co-authored-by: Trueffel <106771418+Trueffeloot@users.noreply.github.com>
Co-authored-by: ErraticOocca <161252953+ErraticOocca@users.noreply.github.com>
This commit is contained in:
Jeff Padgham
2024-03-13 08:23:47 -07:00
committed by GitHub
parent 51c5255edc
commit 4f4ac03a67
22 changed files with 251 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.h
+49 -1
View File
@@ -1,6 +1,54 @@
#ifndef D_A_OBJ_LV3CANDLE_H
#define D_A_OBJ_LV3CANDLE_H
#include "dolphin/types.h"
#include "Z2AudioLib/Z2SoundObject.h"
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv3Candle_HIO_c : public mDoHIO_entry_c {
public:
/* 80C57ACC */ daLv3Candle_HIO_c();
/* 80C58484 */ virtual ~daLv3Candle_HIO_c() {}
/* 0x00 vtable */
/* 0x04 */ u8 field_0x04;
};
class daLv3Candle_c : public fopAc_ac_c {
public:
/* 80C57B38 */ void setBaseMtx();
/* 80C57BC0 */ int CreateHeap();
/* 80C57C40 */ cPhs__Step create();
/* 80C57F6C */ static int createHeapCallBack(fopAc_ac_c*);
/* 80C57F8C */ void lightInit();
/* 80C58018 */ void pointLightProc();
/* 80C580A0 */ int Execute();
/* 80C582FC */ int Draw();
/* 80C583A0 */ int Delete();
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getType() { return fopAcM_GetParamBit(this, 8, 8); }
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ u8 mType;
/* 0x578 */ dCcD_Stts mStts;
/* 0x5B4 */ dCcD_Sph mSph;
/* 0x6EC */ cXyz mTorchPos;
/* 0x6F8 */ u32 field_0x6f8; // Unused?
/* 0x6FC */ cXyz mLightPos;
/* 0x708 */ u8 mIsLit;
/* 0x70C */ f32 mIntensity;
/* 0x710 */ LIGHT_INFLUENCE mLight;
/* 0x730 */ u8 mTgHit;
/* 0x734 */ Z2SoundObjSimple mSound;
static dCcD_SrcGObjInf const mCcDObjInfo;
static dCcD_SrcSph mCcDSph;
}; // Size: 0x754
STATIC_ASSERT(sizeof(daLv3Candle_c) == 0x754);
#endif /* D_A_OBJ_LV3CANDLE_H */