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

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

4
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

@ -746,7 +746,7 @@ void func_80A3BA40(GlobalContext* globalCtx, EnGirlA* this) {
void func_80A3BB6C(GlobalContext* globalCtx, EnGirlA* this) {
if (this->actor.params == 12) {
if (gSaveContext.infTable[7] & 0x40) {
Rupees_ChangeBy(-(this->unk_1C8 - D_80A3CCB4[(s32)Math_Rand_ZeroFloat(7.9f)]));
Rupees_ChangeBy(-(this->unk_1C8 - D_80A3CCB4[(s32)Rand_ZeroFloat(7.9f)]));
return;
}
}
@ -988,7 +988,7 @@ void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx) {
if (this->unk_1B4 != 0) {
this->unk_1B8 += 0x1F4;
} else {
Math_SmoothScaleMaxMinS(&this->unk_1B8, 0, 10, 0x7D0, 0);
Math_SmoothStepToS(&this->unk_1B8, 0, 10, 0x7D0, 0);
}
}
}