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

Defines for player state flags (#1081)

Browse source 
* script-assisted player state flags

* Run formatter

* manually convert state flags in `D_80116068`

* `PLAYER_STATE_FLAG_` -> `PLAYER_STATE`

* Run formatter
This commit is contained in:
Dragorn421 2022-01-18 01:04:07 +01:00 • committed by GitHub
parent 2a4fb604fb
commit 6479913daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 945 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Test/z_en_test.c
View file

@ -402,7 +402,7 @@ void EnTest_ChooseAction(EnTest* this, GlobalContext* globalCtx) {
} else {
if (this->actor.xzDistToPlayer < 110.0f) {
if (Rand_ZeroOne() > 0.2f) {
if (player->stateFlags1 & 0x10) {
if (player->stateFlags1 & PLAYER_STATE1_4) {
if (this->actor.isTargeted) {
EnTest_SetupSlashDown(this);
} else {
@ -688,7 +688,7 @@ void EnTest_WalkAndBlock(EnTest* this, GlobalContext* globalCtx) {
if (this->actor.xzDistToPlayer < 110.0f) {
if (Rand_ZeroOne() > 0.2f) {
if (player->stateFlags1 & 0x10) {
if (player->stateFlags1 & PLAYER_STATE1_4) {
if (this->actor.isTargeted) {
EnTest_SetupSlashDown(this);
} else {
@ -973,7 +973,7 @@ void EnTest_SlashDownEnd(EnTest* this, GlobalContext* globalCtx) {
if ((ABS(yawDiff) > 0x3E80) && (this->actor.params != STALFOS_TYPE_CEILING)) {
this->actor.world.rot.y = this->actor.yawTowardsPlayer;
EnTest_SetupJumpBack(this);
} else if (player->stateFlags1 & 0x10) {
} else if (player->stateFlags1 & PLAYER_STATE1_4) {
if (this->actor.isTargeted) {
EnTest_SetupSlashDown(this);
} else if ((globalCtx->gameplayFrames % 2) != 0) {