1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 23:11:20 +00:00

Document Attention/Lock-on Related Actor Flags (#2161)

* document actor flags 0, 2, 3, and 27

* format

* fly -> hover

* wodring
This commit is contained in:
fig02 2024-09-07 17:53:48 -04:00 committed by GitHub
parent a039aeffb7
commit 2056ae5f1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
181 changed files with 616 additions and 597 deletions

View file

@ -1134,7 +1134,7 @@ void EnNb_CrawlspaceSpawnCheck(EnNb* this, PlayState* play) {
EnNb_SetCurrentAnim(this, &gNabooruStandingHandsOnHipsAnim, 0, 0.0f, 0);
this->headTurnFlag = 1;
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL;
this->actor.world.pos = this->finalPos;
this->action = NB_IDLE_AFTER_TALK;
this->drawMode = NB_DRAW_DEFAULT;
@ -1214,7 +1214,7 @@ void EnNb_SetupIdleCrawlspace(EnNb* this, s32 animFinished) {
if (animFinished) {
EnNb_SetCurrentAnim(this, &gNabooruStandingHandsOnHipsAnim, 0, -8.0f, 0);
this->headTurnFlag = 1;
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL;
this->action = NB_IDLE_CRAWLSPACE;
}
}
@ -1225,7 +1225,7 @@ void func_80AB3838(EnNb* this, PlayState* play) {
this->action = NB_IN_DIALOG;
} else {
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL;
if (!GET_INFTABLE(INFTABLE_16C)) {
this->actor.textId = 0x601D;
@ -1241,7 +1241,7 @@ void EnNb_SetupPathMovement(EnNb* this, PlayState* play) {
EnNb_SetCurrentAnim(this, &gNabooruStandingToWalkingTransitionAnim, 2, -8.0f, 0);
SET_EVENTCHKINF(EVENTCHKINF_94);
this->action = NB_IN_PATH;
this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_3);
this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL);
}
void EnNb_SetTextIdAsChild(EnNb* this, PlayState* play) {
@ -1261,7 +1261,7 @@ void EnNb_SetTextIdAsChild(EnNb* this, PlayState* play) {
}
this->action = NB_IDLE_CRAWLSPACE;
}
this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_3);
this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL);
} else if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) {
choiceIndex = play->msgCtx.choiceIndex;
@ -1319,7 +1319,7 @@ void func_80AB3B04(EnNb* this, PlayState* play) {
this->action = NB_ACTION_30;
} else {
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL;
this->actor.textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_NABOORU);
if (this->actor.textId == 0) {
@ -1333,7 +1333,7 @@ void func_80AB3B04(EnNb* this, PlayState* play) {
void func_80AB3B7C(EnNb* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) {
this->action = NB_IDLE_AFTER_TALK;
this->actor.flags &= ~(ACTOR_FLAG_0 | ACTOR_FLAG_3);
this->actor.flags &= ~(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_NEUTRAL);
}
}