diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2021-12-06 01:11:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-05 19:11:38 -0500 |
| commit | a9284494f2b6f53a0e8f95b5567faf1b2162e91c (patch) | |
| tree | b09701e147c47f177fdcae2e8bcf6ea90a5bb85b /src/code/code_800430A0.c | |
| parent | 79220ba58ae550441e42b4d2c79af7f7e4b9787b (diff) | |
Use defines for actor flags (#873)
* Add ACTOR_FLAG_ defines
* Add ACTOR_FLAGS_ALL macro and use ACTOR_FLAG_* constants everywhere
* Remove unused ACTOR_FLAG_* constants
* actor flags in bigokuta & ko
* actor flags in obj_mure
* actor flags in stalfos, twinrova & ganon2
* actor flags in morpha & barinade
* name some previously missed actor flags
* found some comments using hex for actor flags
* Actor flags in ovl_En_Ganon_Mant
* Actor flags in EnWf
* Flags in en_zf
* Actor flags in BossGanon (FeelsOKMan)
* Remove `ACTOR_FLAG_NONE`
* Wrap expansion of `FLAGS` in parentheses
* `ACTOR_FLAGS_ALL` -> `CHECK_FLAG_ALL`
* Move `CHECK_FLAG_ALL` to `macros.h`
* Run formatter
Diffstat (limited to 'src/code/code_800430A0.c')
| -rw-r--r-- | src/code/code_800430A0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index 673c60515..95c7c4fc5 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -62,7 +62,7 @@ void func_80043334(CollisionContext* colCtx, Actor* actor, s32 bgId) { if (dynaActor != NULL) { func_800434A8(dynaActor); - if ((actor->flags & 0x4000000) == 0x4000000) { + if (CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_26)) { func_80043538(dynaActor); } } |