mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various cleanups and matches (#2530)

Browse Source
This commit is contained in:
hatal175
2025-07-12 23:57:59 +03:00
committed by GitHub
parent cdab0e87a8
commit a193071d9c
20 changed files with 367 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_hozelda.h
+3 -1
View File
@@ -38,8 +38,10 @@ public:
/* 0x100 */ f32 mNowOffsetY;
};
class daHoZelda_hio_c {
class daHoZelda_hio_c : public JORReflexible {
public:
daHoZelda_hio_c() {}
void genMessage(JORMContext*);
};
/**
include/d/actor/d_a_obj_fmobj.h
+2 -1
View File
@@ -13,8 +13,9 @@ class dBgW;
* @details
*
*/
class obj_fmobj_class : public fopAc_ac_c {
class obj_fmobj_class {
public:
/* 0x000 */ fopAc_ac_c mActor;
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ u8 field_0x570;
/* 0x574 */ J3DModel* mpModel;
include/d/actor/d_a_obj_zrTurara.h
+3 -3
View File
@@ -46,9 +46,9 @@ private:
/* 0x768 */ u8 mDebrisCount;
public:
u8 getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
u8 getScale() { return fopAcM_GetParamBit(this, 0x10, 8); }
int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
int getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
int getScale() { return fopAcM_GetParamBit(this, 0x10, 8); }
static dCcD_SrcGObjInf const mCcDObjInfo;
static dCcD_SrcCyl mCcDCyl;
include/d/actor/d_a_player.h
+1 -1
View File
@@ -912,7 +912,7 @@ public:
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
s16 getDamageWaitTimer() const { return mDamageTimer; }
bool checkWaterInMove() const { return checkNoResetFlg0(FLG0_UNDERWATER); }
bool checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
u32 checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_ICE_FREEZE); }
include/d/actor/d_a_scene_exit.h
+2 -1
View File
@@ -16,10 +16,11 @@ public:
daScex_c() {}
/* 80485838 */ int checkWork();
/* 80485A50 */ int execute();
inline int create();
u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getArg0() { return fopAcM_GetParam(this); }
u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u8 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u16 getOffEventBit() { return home.angle.z & 0xFFF; }
u16 getOnEventBit() { return home.angle.x & 0xFFF; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; }
include/m_Do/m_Do_mtx.h
+1 -1
View File
@@ -100,7 +100,7 @@ inline void cMtx_multVecArray(Mtx mtx, const Vec* src, Vec* dst, u32 count) {
mDoMtx_multVecArray(mtx, src, dst, count);
}
inline void mDoMtx_multVecZero(MtxP param_0, Vec* param_1) {
inline void mDoMtx_multVecZero(CMtxP param_0, Vec* param_1) {
param_1->x = param_0[0][3];
param_1->y = param_0[1][3];
param_1->z = param_0[2][3];