mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 13:30:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix func_80A7492C

Browse source
This commit is contained in:
Sirius902 2020-10-02 22:54:42 -07:00
parent 9f8b35bd0c
commit 307d70867b
1 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -247,37 +247,21 @@ void func_80A7489C(EnIk* this) {
EnIk_SetupAction(this, func_80A7492C);
}
void func_80A7492C(EnIk *this, GlobalContext *globalCtx) {
s16 yawDiff;
s32 phi_a0;
f32 absDist;
void func_80A7492C(EnIk* this, GlobalContext* globalCtx) {
s32 phi_a0 = (this->unk_2FB == 0) ? 0x0AAA : 0x3FFC;
s16 yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y;
phi_a0 = (this->unk_2FB == 0) ? 0x0AAA : 0x3FFC;
yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y;
if ((ABS(yawDiff) <= phi_a0) && (this->actor.xzDistFromLink < 100.0f)) {
absDist = ABS(this->actor.yDistFromLink);
if (absDist < 150.0f) {
if ((globalCtx->gameplayFrames & 1)) {
func_80A74E2C(this);
} else {
func_80A751C8(this);
}
if ((ABS(yawDiff) <= phi_a0) && (this->actor.xzDistFromLink < 100.0f) &&
(ABS(this->actor.yDistFromLink) < 150.0f)) {
if ((globalCtx->gameplayFrames & 1)) {
func_80A74E2C(this);
} else {
block_13:
if (ABS(yawDiff) < 0x4001) {
absDist = ABS(this->actor.yDistFromLink);
if (absDist < 150.0f) {
func_80A74AAC(this);
} else {
block_21:
func_80A74AAC(this);
}
} else {
goto block_21;
}
func_80A751C8(this);
}
} else if ((ABS(yawDiff) <= 0x4000) && (ABS(this->actor.yDistFromLink) < 150.0f)) {
func_80A74AAC(this);
} else {
goto block_13;
func_80A74AAC(this);
}
func_80A745E4(this, globalCtx);
SkelAnime_FrameUpdateMatrix(&this->skelAnime);