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

Consistent naming for Math_ functions (#542)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* maths

* Factoriali -> Factorial

* soon, soon

* renames

* rand

* docs

* merged

* formatting

* little more cleanup

* asm crept back in

* changes to MathF

* smooth criminal

* functions.h
This commit is contained in:
petrie911 2020-12-26 04:44:53 -06:00 • committed by GitHub
parent 81c269b417
commit 8fa6cb6ff9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1329 changed files with 8413 additions and 8374 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
View file

@ -412,8 +412,8 @@ s32 ObjOshihiki_CheckGround(ObjOshihiki* this, GlobalContext* globalCtx) {
s32 ObjOshihiki_CheckWall(GlobalContext* globalCtx, s16 angle, f32 direction, ObjOshihiki* this) {
f32 maxDist = ((direction >= 0.0f) ? 1.0f : -1.0f) * (300.0f * this->dyna.actor.scale.x + 20.0f - 0.5f);
f32 sn = Math_Sins(angle);
f32 cs = Math_Coss(angle);
f32 sn = Math_SinS(angle);
f32 cs = Math_CosS(angle);
s32 i;
for (i = 0; i < 4; i++) {
@ -571,7 +571,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, GlobalContext* globalCtx) {
this->pushSpeed += 0.5f;
this->stateFlags |= PUSHBLOCK_PUSH;
this->pushSpeed = CLAMP_MAX(this->pushSpeed, 2.0f);
stopFlag = Math_ApproxF(&this->pushDist, 20.0f, this->pushSpeed);
stopFlag = Math_StepToF(&this->pushDist, 20.0f, this->pushSpeed);
pushDistSigned = ((this->direction >= 0.0f) ? 1.0f : -1.0f) * this->pushDist;
thisx->posRot.pos.x = thisx->initPosRot.pos.x + (pushDistSigned * this->yawSin);
thisx->posRot.pos.z = thisx->initPosRot.pos.z + (pushDistSigned * this->yawCos);
@ -651,8 +651,8 @@ void ObjOshihiki_Update(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.posRot.rot.y = this->dyna.unk_158;
this->yawSin = Math_Sins(this->dyna.actor.posRot.rot.y);
this->yawCos = Math_Coss(this->dyna.actor.posRot.rot.y);
this->yawSin = Math_SinS(this->dyna.actor.posRot.rot.y);
this->yawCos = Math_CosS(this->dyna.actor.posRot.rot.y);
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);