mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +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

3
src/overlays/actors/ovl_En_Mb/z_en_mb.c
View file

@ -676,8 +676,7 @@ void func_80AA7938(EnMb* this, GlobalContext* globalCtx) {
s16 sp54[] = { 20, 40, 0 };
s16 sp4C[] = { -2500, 0, 3500 };
Math_SmoothStepToS(&this->actor.shape.rot.y, sp4C[this->attackParams - 1] + this->actor.posRot.rot.y, 1, 0x2EE,
0);
Math_SmoothStepToS(&this->actor.shape.rot.y, sp4C[this->attackParams - 1] + this->actor.posRot.rot.y, 1, 0x2EE, 0);
if (this->collider2.base.atFlags & 2) {
this->collider2.base.atFlags &= ~2;