diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2025-11-09 11:32:48 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-09 11:32:48 -0800 |
| commit | cefde2a42cab384221da75210601d72b5a64dcd3 (patch) | |
| tree | 45d9aa70d3b0e5be22f57eefc739df75c830dd1f /include/d | |
| parent | 885e29c359bf2870bba14e5496e3312691d523fe (diff) | |
Debug myna work (#2786)
Diffstat (limited to 'include/d')
| -rw-r--r-- | include/d/actor/d_a_myna.h | 11 | ||||
| -rw-r--r-- | include/d/actor/d_a_tag_myna_light.h | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h index 8d66713031..7159118cc9 100644 --- a/include/d/actor/d_a_myna.h +++ b/include/d/actor/d_a_myna.h @@ -6,7 +6,6 @@ #include "d/d_msg_flow.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" -#include "m_Do/m_Do_hostIO.h" // This struct may end up belonging elsewhere struct ShopItem { @@ -108,8 +107,8 @@ public: /* 80949948 */ J3DAnmTexPattern* getTexPtrnAnm(char*); /* 80949A70 */ int checkEndAnm(J3DFrameCtrl*); /* 80949998 */ int checkEndAnm(f32); - /* 80949AD4 */ int getItemNumMax(); - /* 80949AE0 */ int getItemType(void*); + /* 80949AD4 */ u8 getItemNumMax(); + /* 80949AE0 */ u8 getItemType(void*); /* 80949C0C */ u16 getFlowNodeNum(); /* 80949C44 */ void checkDead(); /* 80949D54 */ int chkPlayerInEvtArea(fopAc_ac_c*, cXyz); @@ -123,7 +122,9 @@ public: void onEventFlag(u8 flag) { field_0x92F |= (u8)(1 << flag); } void offEventFlag(u8 flag) { field_0x92F &= (u8)~(u8)(1 << flag); } - bool isEventFlag(u8 flag) { return field_0x92F & (u8)(1 << flag); } + bool isEventFlag(u8 flag) { + return (field_0x92F & (u8)(1 << flag)) ? true : false; + } fopAc_ac_c* getSpeakActorPtr() { return field_0x828; } @@ -163,7 +164,7 @@ public: /* 0x920 */ s16 field_0x920; /* 0x922 */ s16 field_0x922; /* 0x924 */ s16 field_0x924; - /* 0x926 */ s16 field_0x926; + /* 0x926 */ s16 mDamageTimer; /* 0x928 */ s16 field_0x928; /* 0x92A */ s16 field_0x92A; /* 0x92C */ u8 field_0x92C; diff --git a/include/d/actor/d_a_tag_myna_light.h b/include/d/actor/d_a_tag_myna_light.h index 8d811c4721..3e0882fba1 100644 --- a/include/d/actor/d_a_tag_myna_light.h +++ b/include/d/actor/d_a_tag_myna_light.h @@ -17,8 +17,7 @@ public: /* 80D5D298 */ virtual ~daTag_MynaLight_c(); bool checkTurnOnOffChange() { - bool var1 = mTurnOnFlag - field_0x578; - return var1 & 0xFF; + return (field_0x578 != mTurnOnFlag) ? true : false; } bool getTurnOnFlag() { return mTurnOnFlag; } |