mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +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_Rr/z_en_rr.c
View file

@ -8,7 +8,7 @@
#include "objects/object_rr/object_rr.h"
#include "vt.h"
#define FLAGS 0x00000435
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_10)
#define RR_MESSAGE_SHIELD (1 << 0)
#define RR_MESSAGE_TUNIC (1 << 1)
@ -252,7 +252,7 @@ void EnRr_SetupGrabPlayer(EnRr* this, Player* player) {
s32 i;
this->grabTimer = 100;
this->actor.flags &= ~1;
this->actor.flags &= ~ACTOR_FLAG_0;
this->ocTimer = 8;
this->hasPlayer = true;
this->reachState = 0;
@ -287,7 +287,7 @@ void EnRr_SetupReleasePlayer(EnRr* this, GlobalContext* globalCtx) {
u8 shield;
u8 tunic;
this->actor.flags |= 1;
this->actor.flags |= ACTOR_FLAG_0;
this->hasPlayer = false;
this->ocTimer = 110;
this->segMoveRate = 0.0f;
@ -379,7 +379,7 @@ void EnRr_SetupDeath(EnRr* this) {
}
this->actionFunc = EnRr_Death;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_LIKE_DEAD);
this->actor.flags &= ~1;
this->actor.flags &= ~ACTOR_FLAG_0;
}
void EnRr_SetupStunned(EnRr* this) {