mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-28 03:50:07 +00:00
Code Issues Projects Releases Wiki Activity

Better diff again

Browse source
This commit is contained in:
Sirius902 2020-10-05 17:53:57 -07:00
parent d824f48039
commit 4920d40453
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -282,31 +282,30 @@ void func_80A74BA4(EnIk* this, GlobalContext* globalCtx) {
s16 yawDiff; s16 yawDiff;
s16 sp30; s16 sp30;
s16 sp2E; s16 sp2E;
s16 phi_t0;
s32 phi_a1; s32 phi_a1;
s16 phi_a3; s16 phi_a3;
if (this->unk_2FB == 0) { if (this->unk_2FB == 0) {
phi_t0 = 0xAAA; temp_t0 = 0xAAA;
phi_a3 = 0x320; phi_a3 = 0x320;
sp30 = 0; sp30 = 0;
sp2E = 0x10; sp2E = 0x10;
} else { } else {
phi_t0 = 0x3FFC; temp_t0 = 0x3FFC;
phi_a3 = 0x4B0; phi_a3 = 0x4B0;
sp30 = 2; sp30 = 2;
sp2E = 9; sp2E = 9;
} }
temp_a1 = this->actor.wallPolyRot - this->actor.shape.rot.y; temp_a1 = this->actor.wallPolyRot - this->actor.shape.rot.y;
if ((this->actor.bgCheckFlags & 8) && (ABS(temp_a1) >= 0x4000)) { if ((this->actor.bgCheckFlags & 8) && (ABS(temp_a1) >= 0x4000)) {
phi_t0 = (this->actor.yawTowardsLink > 0) ? this->actor.wallPolyRot - 0x4000 : this->actor.wallPolyRot + 0x4000; temp_t0 = (this->actor.yawTowardsLink > 0) ? this->actor.wallPolyRot - 0x4000 : this->actor.wallPolyRot + 0x4000;
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, phi_a1, 1, phi_a3, 0); Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, phi_a1, 1, phi_a3, 0);
} else { } else {
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, phi_a3, 0); Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink, 1, phi_a3, 0);
} }
this->actor.shape.rot.y = this->actor.posRot.rot.y; this->actor.shape.rot.y = this->actor.posRot.rot.y;
yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y; yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y;
if ((phi_t0 >= ABS(yawDiff)) && (this->actor.xzDistFromLink < 100.0f)) { if ((temp_t0 >= ABS(yawDiff)) && (this->actor.xzDistFromLink < 100.0f)) {
if (ABS(this->actor.yDistFromLink) < 150.0f) { if (ABS(this->actor.yDistFromLink) < 150.0f) {
if ((globalCtx->gameplayFrames & 1)) { if ((globalCtx->gameplayFrames & 1)) {
func_80A74E2C(this); func_80A74E2C(this);