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

matched Math3D_CylVsLineSeg and fixed a Math_ error (#564)

Browse source 
* matched cylvsline

* slight name adjustment

* format

* and asm

* comment cleanup

* fixed misspelling and added mathfixer tool

* formatting

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2020-12-27 10:13:38 -06:00 • committed by GitHub
parent b95643b397
commit 3727cc38b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 382 additions and 1048 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/overlays/actors/ovl_En_Niw/z_en_niw.c
View file

@ -556,8 +556,7 @@ void func_80AB6570(EnNiw* this, GlobalContext* globalCtx) {
this->unk_29E = 7;
}
Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(posY, posZ) * (0x8000 / M_PI), 3, this->unk_300,
0);
Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(posY, posZ) * (0x8000 / M_PI), 3, this->unk_300, 0);
Math_ApproachF(&this->unk_300, 10000.0f, 1.0f, 1000.0f);
}
@ -819,7 +818,7 @@ void func_80AB7328(EnNiw* this, GlobalContext* globalCtx) {
this->actionFunc = EnNiw_ResetAction;
} else {
this->unk_2E4 = Math_FAtan2F(this->actor.posRot.pos.x - player->actor.posRot.pos.x,
this->actor.posRot.pos.z - player->actor.posRot.pos.z) *
this->actor.posRot.pos.z - player->actor.posRot.pos.z) *
(0x8000 / M_PI);
func_80AB6100(this, globalCtx, 0);
func_80AB5BF8(this, globalCtx, 2);