diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-19 17:10:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-19 14:10:03 -0800 |
| commit | 4cf2c7e37d08cc2ae9c0ef42435fc89ab87734e7 (patch) | |
| tree | 881aa06a300da3bcb30d95a27a18a291463dc47a /include/d | |
| parent | 8956be538efe0517dc2c5f1fbedee9fbed48115d (diff) | |
Misc fixes (#2830)
* Replace DANPCF_C_HACK with a better fakematch
* d_a_obj_item OK
* Fix ninja diff
* Misc debug/nonmatching fixes
* Fix ninja diff for PAL
* Fix bad PAL split
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/actor/d_a_npc.h | 9 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_Turara.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index fa9b6781d5..c8a8f4b1b0 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -488,10 +488,6 @@ public: void setIdx(int i_idx) { mIdx = i_idx; } const int getIdx() { return mIdx; } -#if VERSION != VERSION_SHIELD_DEBUG - // fakematch inline to fix daNpcT_Path_c::chkPassed1 - const u16 get_u16_Idx() { return mIdx; } -#endif dPath* getPathInfo() { return mPathInfo; } @@ -1149,7 +1145,10 @@ public: /* 5 */ LOOK_ATTN, }; - daNpcF_c() { initialize(); } + daNpcF_c() { + FORCE_DONT_INLINE; + initialize(); + } /* 80152014 */ BOOL execute(); /* 801522AC */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL); /* 80152614 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h index a3f6d12e68..6cca41dbdc 100644 --- a/include/d/actor/d_a_obj_Turara.h +++ b/include/d/actor/d_a_obj_Turara.h @@ -41,9 +41,9 @@ public: /* 80B9E388 */ int Draw(); /* 80B9E478 */ int Delete(); - u8 getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } - u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } - u8 getSwBit3() { return fopAcM_GetParamBit(this, 16, 8); } + int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); } + int getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); } + int getSwBit3() { return fopAcM_GetParamBit(this, 16, 8); } s32 getEvetID() { return fopAcM_GetParamBit(this, 0x18, 8); @@ -51,6 +51,7 @@ public: u8 getWaitTime() { return shape_angle.z; } int getItemTbleNum() { return shape_angle.x >> 8 & 0xff; } + int getState() { return shape_angle.x; } static const dCcD_SrcGObjInf mCcDObjInfo; static dCcD_SrcCyl mCcDCyl; @@ -76,7 +77,7 @@ private: /* 0x7a8 */ dBgS_ObjAcch mAcch; /* 0x980 */ dBgW* field_0x980; /* 0x984 */ u8 field_0x984; - /* 0x988 */ u32 field_0x988; + /* 0x988 */ u32 mEmID; /* 0x98c */ u8 field_0x98c; /* 0x98d */ u8 field_0x98d[0x994 - 0x98d]; /* 0x994 */ u8 field_0x994; |