mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 05:51:18 +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

8
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -7,7 +7,7 @@
#include "z_en_ma3.h"
#include "objects/object_ma2/object_ma2.h"
#define FLAGS 0x00000039
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx);
void EnMa3_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -74,7 +74,7 @@ u16 func_80AA2AA0(GlobalContext* globalCtx, Actor* thisx) {
timer1ValuePtr = &gSaveContext.timer1Value;
if (gSaveContext.eventInf[0] & 0x400) {
gSaveContext.timer1Value = gSaveContext.timer1Value;
thisx->flags |= 0x10000;
thisx->flags |= ACTOR_FLAG_16;
if (gSaveContext.timer1Value >= 0xD3) {
return 0x208E;
}
@ -144,7 +144,7 @@ s16 func_80AA2BD4(GlobalContext* globalCtx, Actor* thisx) {
}
case 0x208E:
gSaveContext.eventInf[0] &= ~0x400;
thisx->flags &= ~0x10000;
thisx->flags &= ~ACTOR_FLAG_16;
ret = 0;
gSaveContext.timer1State = 0xA;
break;
@ -269,7 +269,7 @@ void EnMa3_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void func_80AA3200(EnMa3* this, GlobalContext* globalCtx) {
if (this->unk_1E0.unk_00 == 2) {
this->actor.flags &= ~0x10000;
this->actor.flags &= ~ACTOR_FLAG_16;
this->unk_1E0.unk_00 = 0;
}
}