diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2026-01-12 12:18:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-12 22:18:58 +0200 |
| commit | 53aaed17c0a635c8f5542c2b2aeaa65f63c734c4 (patch) | |
| tree | cfcadbcc3c387e03cd89bf77909f5c989155cf89 /include | |
| parent | a2e8347e8d74bb5bdfac723faf5a2a8d30d987e2 (diff) | |
obj_pumpkin dbg equiv (#3036)
Diffstat (limited to 'include')
| -rw-r--r-- | include/SSystem/SComponent/c_angle.h | 3 | ||||
| -rw-r--r-- | include/f_op/f_op_actor_mng.h | 2 | ||||
| -rw-r--r-- | include/global.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/SSystem/SComponent/c_angle.h b/include/SSystem/SComponent/c_angle.h index 29a43cd7df..da03a36bb3 100644 --- a/include/SSystem/SComponent/c_angle.h +++ b/include/SSystem/SComponent/c_angle.h @@ -5,14 +5,17 @@ #define ADD_ANGLE(x, y) ((x) += (s16)(y)) #define SUB_ANGLE(x, y) ((x) -= (s16)(y)) +#define MULT_ANGLE(x, y) ((x) *= (s16)(y)) // There are some angles that weren't sign-extended until the shield version #if !PLATFORM_SHIELD #define ADD_ANGLE_2(x, y) ((x) += (y)) #define SUB_ANGLE_2(x, y) ((x) -= (y)) + #define MULT_ANGLE_2(x, y) ((x) *= (y)) #else #define ADD_ANGLE_2(x, y) ADD_ANGLE(x, y) #define SUB_ANGLE_2(x, y) SUB_ANGLE(x, y) + #define MULT_ANGLE_2(x, y) MULT_ANGLE(x, y) #endif #define DEG2S_CONSTANT (0x8000 / 180.0f) diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b81a7735cf..a5518264b7 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -802,7 +802,7 @@ inline void fopAcM_OnCarryType(fopAc_ac_c* i_actor, fopAcM_CARRY param_2) { } inline void fopAcM_OffCarryType(fopAc_ac_c* i_actor, fopAcM_CARRY param_2) { - i_actor->carryType &= ~param_2; + UNSET_FLAG(i_actor->carryType, param_2, u8); } enum fopAcM_FOOD { diff --git a/include/global.h b/include/global.h index d9e3511b22..8be30974cc 100644 --- a/include/global.h +++ b/include/global.h @@ -140,9 +140,9 @@ static const float INF = 2000000000.0f; // potential fakematch? #if PLATFORM_SHIELD - #define UNSET_FLAG(var, flag) (var) &= (u16)~(flag) + #define UNSET_FLAG(var, flag, type) (var) &= (type)~(flag) #else - #define UNSET_FLAG(var, flag) (var) &= ~(flag) + #define UNSET_FLAG(var, flag, type) (var) &= ~(flag) #endif #endif |