mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Use defines for actor flags (#873)

Browse source 
* 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
This commit is contained in:
Dragorn421 2021-12-06 01:11:38 +01:00 • committed by GitHub
parent 79220ba58a
commit a9284494f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
439 changed files with 1342 additions and 1304 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Ny/z_en_ny.c
View file

@ -1,7 +1,7 @@
#include "z_en_ny.h"
#include "objects/object_ny/object_ny.h"
#define FLAGS 0x00000005
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2)
void EnNy_Init(Actor* thisx, GlobalContext* globalCtx);
void EnNy_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -330,7 +330,7 @@ s32 EnNy_CollisionCheck(EnNy* this, GlobalContext* globalCtx) {
this->stoneTimer = 0;
if (this->actor.colChkInfo.health == 0) {
this->actor.shape.shadowAlpha = 0;
this->actor.flags &= ~1;
this->actor.flags &= ~ACTOR_FLAG_0;
this->unk_1D0 = sp3F;
Enemy_StartFinishingBlow(globalCtx, &this->actor);
return 1;