mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Match some entity actors H-N (#1827)

Browse source
This commit is contained in:
cadmic 2024-02-22 06:08:40 -08:00 • committed by GitHub
parent 33d8044e45
commit 93295a842b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 219 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Nb/z_en_nb.c
View file

@ -193,6 +193,7 @@ void EnNb_UpdateEyes(EnNb* this) {
}
}
#if OOT_DEBUG
void func_80AB11EC(EnNb* this) {
this->action = NB_ACTION_7;
this->drawMode = NB_DRAW_NOTHING;
@ -220,6 +221,7 @@ void func_80AB1210(EnNb* this, PlayState* play) {
}
}
}
#endif
void func_80AB1284(EnNb* this, PlayState* play) {
Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 30.0f, 30.0f, UPDBGCHECKINFO_FLAG_2);
@ -530,7 +532,9 @@ void EnNb_SetupLightOrb(EnNb* this, PlayState* play) {
void EnNb_Hide(EnNb* this, PlayState* play) {
EnNb_SetupHide(this, play);
#if OOT_DEBUG
func_80AB1210(this, play);
#endif
}
void EnNb_Fade(EnNb* this, PlayState* play) {
@ -538,7 +542,9 @@ void EnNb_Fade(EnNb* this, PlayState* play) {
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_CheckToFade(this, play);
#if OOT_DEBUG
func_80AB1210(this, play);
#endif
}
void EnNb_CreateLightOrb(EnNb* this, PlayState* play) {
@ -546,7 +552,9 @@ void EnNb_CreateLightOrb(EnNb* this, PlayState* play) {
EnNb_UpdateSkelAnime(this);
EnNb_UpdateEyes(this);
EnNb_SetupLightOrb(this, play);
#if OOT_DEBUG
func_80AB1210(this, play);
#endif
}
void EnNb_DrawTransparency(EnNb* this, PlayState* play) {
@ -1121,6 +1129,8 @@ void EnNb_CrawlspaceSpawnCheck(EnNb* this, PlayState* play) {
this->action = NB_CROUCH_CRAWLSPACE;
this->drawMode = NB_DRAW_DEFAULT;
} else {
s32 pad;
EnNb_SetCurrentAnim(this, &gNabooruStandingHandsOnHipsAnim, 0, 0.0f, 0);
this->headTurnFlag = 1;
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
@ -1210,6 +1220,8 @@ void EnNb_SetupIdleCrawlspace(EnNb* this, s32 animFinished) {
void func_80AB3838(EnNb* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
s32 pad;
this->action = NB_IN_DIALOG;
} else {
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
@ -1302,6 +1314,8 @@ void func_80AB3A7C(EnNb* this, PlayState* play, s32 animFinished) {
void func_80AB3B04(EnNb* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, play)) {
s32 pad;
this->action = NB_ACTION_30;
} else {
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_3;
@ -1472,6 +1486,8 @@ s32 EnNb_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po
if (this->headTurnFlag != 0) {
if (limbIndex == NB_LIMB_TORSO) {
s32 pad;
rot->x += interactInfo->torsoRot.y;
rot->y -= interactInfo->torsoRot.x;
ret = false;