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

10
src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
View file

@ -9,7 +9,7 @@
#include "scenes/overworld/spot06/spot06_scene.h"
#include "vt.h"
#define FLAGS 0x00000009
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)
void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx);
void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx);
@ -61,15 +61,15 @@ void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx) {
params = this->actor.params & 0xFF;
if (params == 0x40 || params == 0x41) {
this->unk_1A4 = 0;
this->actor.flags |= 0x10;
this->actor.flags |= 0x2000000;
this->actor.flags |= ACTOR_FLAG_4;
this->actor.flags |= ACTOR_FLAG_25;
this->actionFunc = func_80BADF0C;
this->actor.flags |= 0x8000000;
this->actor.flags |= ACTOR_FLAG_27;
} else {
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
this->actionFunc = ShotSun_UpdateHyliaSun;
this->actor.flags &= ~1;
this->actor.flags &= ~ACTOR_FLAG_0;
}
}