mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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

6
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
View file

@ -9,7 +9,7 @@
#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
#include "objects/object_tsubo/object_tsubo.h"
#define FLAGS 0x00800010
#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23)
void ObjTsubo_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjTsubo_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -226,7 +226,7 @@ void ObjTsubo_WaitForObject(ObjTsubo* this, GlobalContext* globalCtx) {
this->actor.draw = ObjTsubo_Draw;
this->actor.objBankIndex = this->objTsuboBankIndex;
ObjTsubo_SetupIdle(this);
this->actor.flags &= ~0x10;
this->actor.flags &= ~ACTOR_FLAG_4;
}
}
@ -276,7 +276,7 @@ void ObjTsubo_SetupLiftedUp(ObjTsubo* this) {
this->actionFunc = ObjTsubo_LiftedUp;
this->actor.room = -1;
func_8002F7DC(&this->actor, NA_SE_PL_PULL_UP_POT);
this->actor.flags |= 0x10;
this->actor.flags |= ACTOR_FLAG_4;
}
void ObjTsubo_LiftedUp(ObjTsubo* this, GlobalContext* globalCtx) {