diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 75399fe78..21eda6286 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -2288,9 +2288,9 @@ s32 func_80B561A4(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { Math_Vec3f_Copy(&this->actor.world.pos, &firstPos); if (ABS_ALT(BINANG_SUB(this->actor.world.rot.y, door->knobDoor.dyna.actor.shape.rot.y)) <= 0x4000) { - this->unk_215 = -0x4B; + this->doorOpenTimer = -75; } else { - this->unk_215 = 0x4B; + this->doorOpenTimer = 75; } this->unk_378 = scheduleOutput->time1 - scheduleOutput->time0; @@ -2772,7 +2772,7 @@ s32 func_80B56EB4(EnAn* this, PlayState* play) { if ((door != NULL) && (door->knobDoor.dyna.actor.update != NULL)) { // Tell the door to be open while passing through it and which orientation if ((this->unk_37A / (f32)this->unk_378) <= 0.9f) { - door->openTimer = this->unk_215; + door->openTimer = this->doorOpenTimer; } else { door->openTimer = 0; } @@ -2965,7 +2965,7 @@ s32 func_80B57674(EnAn* this, PlayState* play) { return 1; } -void func_80B57718(EnAn* this, PlayState* play) { +void EnAn_HandleSchedule(EnAn* this, PlayState* play) { switch (this->scheduleResult) { case ANJU_SCH_RECEIVE_LETTER_FROM_POSTMAN: case ANJU_SCH_ATTEND_GORON: @@ -3045,7 +3045,6 @@ void func_80B57718(EnAn* this, PlayState* play) { Math_ApproachS(&this->actor.shape.rot.y, this->actor.world.rot.y, 3, 0x2AA8); } -// Tentative name void EnAn_Initialize(EnAn* this, PlayState* play) { ActorShape_Init(&this->actor.shape, 0.0f, NULL, 14.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gAnju1Skel, NULL, this->jointTable, this->morphTable, ANJU1_LIMB_MAX); @@ -3096,7 +3095,7 @@ void EnAn_FollowSchedule(EnAn* this, PlayState* play) { this->scheduleResult = scheduleOutput.result; this->lookAtActor = EnAn_FindLookAtActor(this, play); - func_80B57718(this, play); + EnAn_HandleSchedule(this, play); } void EnAn_Talk(EnAn* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h index c82929154..bc13a33a1 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.h +++ b/src/overlays/actors/ovl_En_An/z_en_an.h @@ -50,7 +50,7 @@ typedef struct EnAn { /* 0x20C */ s8 msmoObjectSlot; /* 0x210 */ s32 msgScriptResumePos; /* 0x214 */ s8 roomNum; - /* 0x215 */ s8 unk_215; + /* 0x215 */ s8 doorOpenTimer; /* 0x218 */ Actor* lookAtActor; /* 0x21C */ UNK_TYPE1 unk_21C[0xC]; /* 0x228 */ Vec3f unk_228; diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index c7d7e61a4..ea12278da 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -14057,7 +14057,7 @@ 0x80B573F4:("func_80B573F4",), 0x80B575BC:("func_80B575BC",), 0x80B57674:("func_80B57674",), - 0x80B57718:("func_80B57718",), + 0x80B57718:("EnAn_HandleSchedule",), 0x80B577F0:("EnAn_Initialize",), 0x80B578F8:("EnAn_FollowSchedule",), 0x80B57A44:("EnAn_Talk",),