diff options
| author | roeming <brother64youyou@gmail.com> | 2026-01-04 20:22:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-04 17:22:04 -0800 |
| commit | 1400687731baedd9419dbf3972c50e3faab0f24e (patch) | |
| tree | 95833e6a68cde9708aa6fa1bd447ecf1cfe8ecd2 /include | |
| parent | b72be3074adae802510f47643cac7bfc1fd6e9c7 (diff) | |
d_a_e_rdy debug work (#3011)
* debug work for d_a_e_rdy
* remove unused fake function
* fix regressions
* rename variable
* Fix version diffs of angle adding
Diffstat (limited to 'include')
| -rw-r--r-- | include/SSystem/SComponent/c_angle.h | 7 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_lib.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_e_yc.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/SSystem/SComponent/c_angle.h b/include/SSystem/SComponent/c_angle.h index 40377f4283..4afd36e504 100644 --- a/include/SSystem/SComponent/c_angle.h +++ b/include/SSystem/SComponent/c_angle.h @@ -3,6 +3,13 @@ #include "SSystem/SComponent/c_xyz.h" +#if PLATFORM_SHIELD +#define ADD_ANGLE(x, y) ((x) += (s16)(y)) +#else +#define ADD_ANGLE(x, y) ((x) += (y)) +#endif + + class cSAngle { private: s16 mAngle; diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 48cf3c71df..4a29fb58b3 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -102,7 +102,7 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void MtxPush(void); -Mtx* MtxPull(void); +void MtxPull(void); extern Mtx* calc_mtx; diff --git a/include/d/actor/d_a_e_yc.h b/include/d/actor/d_a_e_yc.h index 03d3d0606d..18920192b6 100644 --- a/include/d/actor/d_a_e_yc.h +++ b/include/d/actor/d_a_e_yc.h @@ -43,7 +43,7 @@ public: /* 0x6A2 */ s16 mTimer[4]; /* 0x6AA */ s16 mCcDisableTimer; /* 0x6AC */ u32 mRiderID; - /* 0x6B0 */ u8 field_0x6b0; + /* 0x6B0 */ s8 field_0x6b0; /* 0x6B1 */ u8 field_0x6b1; /* 0x6B2 */ s8 mNoDrawFlag; /* 0x6B3 */ s8 mWolfBiteDamageCount; |