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

12
src/overlays/actors/ovl_En_Ds/z_en_ds.c
View file

@ -113,7 +113,7 @@ void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx) {
func_8010B720(globalCtx, 0x504D);
}
Math_ApproxF(&this->unk_1E4, 0, 0.03f);
Math_StepToF(&this->unk_1E4, 0, 0.03f);
func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f);
}
@ -135,7 +135,7 @@ void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx) {
this->brewTimer = 20;
}
Math_ApproxF(&this->unk_1E4, 1.0f, 0.01f);
Math_StepToF(&this->unk_1E4, 1.0f, 0.01f);
func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f);
}
@ -247,10 +247,10 @@ void EnDs_Update(Actor* thisx, GlobalContext* globalCtx) {
if (this->unk_1E8 & 1) {
func_80038290(globalCtx, this, &this->unk_1D8, &this->unk_1DE, this->actor.posRot2.pos);
} else {
Math_SmoothScaleMaxMinS(&this->unk_1D8.x, 0, 6, 0x1838, 100);
Math_SmoothScaleMaxMinS(&this->unk_1D8.y, 0, 6, 0x1838, 100);
Math_SmoothScaleMaxMinS(&this->unk_1DE.x, 0, 6, 0x1838, 100);
Math_SmoothScaleMaxMinS(&this->unk_1DE.y, 0, 6, 0x1838, 100);
Math_SmoothStepToS(&this->unk_1D8.x, 0, 6, 0x1838, 100);
Math_SmoothStepToS(&this->unk_1D8.y, 0, 6, 0x1838, 100);
Math_SmoothStepToS(&this->unk_1DE.x, 0, 6, 0x1838, 100);
Math_SmoothStepToS(&this->unk_1DE.y, 0, 6, 0x1838, 100);
}
}