mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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

14
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -8,7 +8,7 @@
#include "vt.h"
#include "objects/object_ta/object_ta.h"
#define FLAGS 0x00000009
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)
void EnTa_Init(Actor* thisx, GlobalContext* globalCtx);
void EnTa_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -180,7 +180,7 @@ void EnTa_Init(Actor* thisx, GlobalContext* globalCtx2) {
Actor_Kill(&this->actor);
} else {
if (IS_DAY) {
this->actor.flags |= 0x10;
this->actor.flags |= ACTOR_FLAG_4;
this->unk_2C4[0] = this->unk_2C4[1] = this->unk_2C4[2] = 7;
this->superCuccos[0] = (EnNiw*)Actor_Spawn(
&globalCtx->actorCtx, globalCtx, ACTOR_EN_NIW, this->actor.world.pos.x + 5.0f,
@ -453,7 +453,7 @@ void func_80B14AF4(EnTa* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_VO_TA_CRY_1);
func_80B13AA0(this, func_80B14A54, func_80B167C0);
this->unk_2CC = 65;
this->actor.flags |= 0x10;
this->actor.flags |= ACTOR_FLAG_4;
}
}
@ -616,7 +616,7 @@ void func_80B15100(EnTa* this, GlobalContext* globalCtx) {
void func_80B15260(EnTa* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) {
this->actionFunc = func_80B15100;
this->actor.flags &= ~0x10000;
this->actor.flags &= ~ACTOR_FLAG_16;
} else {
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
}
@ -723,7 +723,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
break;
}
this->actionFunc = func_80B15260;
this->actor.flags |= 0x10000;
this->actor.flags |= ACTOR_FLAG_16;
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
return;
}
@ -1045,9 +1045,9 @@ void func_80B16608(EnTa* this, GlobalContext* globalCtx) {
this->actionFunc = func_80B1642C;
break;
}
this->actor.flags &= ~0x10000;
this->actor.flags &= ~ACTOR_FLAG_16;
} else {
this->actor.flags |= 0x10000;
this->actor.flags |= ACTOR_FLAG_16;
func_8002F2CC(&this->actor, globalCtx, 1000.0f);
}
this->unk_2E0 |= 1;