diff options
| author | fig02 <fig02srl@gmail.com> | 2025-04-26 19:07:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-26 19:07:52 -0400 |
| commit | ea22c2ac38bb8cbb459210ce868398c5e7bdcda4 (patch) | |
| tree | 17baba3cb29c16e3abae60e840e40e902d0108c1 /include | |
| parent | bed76a3bf3cd89456e3331b2c2b50dbc5f79fe48 (diff) | |
create ACTOR_FLAGS_CHECK_ALL (#2515)
Diffstat (limited to 'include')
| -rw-r--r-- | include/macros.h | 2 | ||||
| -rw-r--r-- | include/z64actor.h | 2 | ||||
| -rw-r--r-- | include/z64save.h | 13 |
3 files changed, 7 insertions, 10 deletions
diff --git a/include/macros.h b/include/macros.h index 98efe590c..9cb702f0b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -1,6 +1,4 @@ #ifndef MACROS_H #define MACROS_H -#define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask)) - #endif diff --git a/include/z64actor.h b/include/z64actor.h index 2709356b9..1a8b50329 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -160,6 +160,8 @@ typedef struct ActorShape { // Flag controlling the use of `Actor.sfx`. Do not use directly. See Actor_PlaySfx_FlaggedTimer #define ACTOR_FLAG_SFX_TIMER (1 << 28) +#define ACTOR_FLAGS_CHECK_ALL(thisx, mask) (((thisx)->flags & (mask)) == (mask)) + #define COLORFILTER_GET_COLORINTENSITY(colorFilterParams) (((colorFilterParams) & 0x1F00) >> 5) #define COLORFILTER_GET_DURATION(colorFilterParams) ((colorFilterParams) & 0xFF) diff --git a/include/z64save.h b/include/z64save.h index af03e8ca6..71b141405 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -592,14 +592,11 @@ typedef enum LinkAge { (EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_0_RESCUED) | EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_1_RESCUED) | \ EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_2_RESCUED) | EVENTCHKINF_MASK(EVENTCHKINF_CARPENTER_3_RESCUED)) -#define GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED() \ - CHECK_FLAG_ALL(gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED], \ - EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK) - -#define GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED2() \ - CHECK_FLAG_ALL(gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] & \ - (EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK | 0xF0), \ - EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK) +#define GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED() \ + ((gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] & EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK) == (EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK)) + +#define GET_EVENTCHKINF_CARPENTERS_ALL_RESCUED2() \ + ((gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX_CARPENTERS_RESCUED] & (EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK | 0xF0) & EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK) == (EVENTCHKINF_CARPENTERS_ALL_RESCUED_MASK)) #define ENDAIKU_CARPENTER_RESCUED_MASK(carpenterType) (1 << (carpenterType)) |