obj_pumpkin dbg equiv (#3036)

This commit is contained in:
YunataSavior
2026-01-12 12:18:58 -08:00
committed by GitHub
parent 36984571ff
commit e3b78563d1
5 changed files with 15 additions and 11 deletions
+3
View File
@@ -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)
+1 -1
View File
@@ -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 {
+2 -2
View File
@@ -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