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

6
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -223,7 +223,7 @@ void func_80AA2F80(EnMa3* this) {
if ((!func_80AA2F28(this)) && (DECR(this->unk_20C) == 0)) {
this->unk_20E += 1;
if (this->unk_20E >= 3) {
this->unk_20C = Math_Rand_S16Offset(0x1E, 0x1E);
this->unk_20C = Rand_S16Offset(0x1E, 0x1E);
this->unk_20E = 0;
}
}
@ -322,8 +322,8 @@ s32 EnMa3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
Matrix_RotateX((-vec.x / 32768.0f) * M_PI, MTXMODE_APPLY);
}
if ((limbIndex == 11) || (limbIndex == 12) || (limbIndex == 15)) {
rot->y += Math_Sins(this->unk_212[limbIndex].y) * 200.0f;
rot->z += Math_Coss(this->unk_212[limbIndex].z) * 200.0f;
rot->y += Math_SinS(this->unk_212[limbIndex].y) * 200.0f;
rot->z += Math_CosS(this->unk_212[limbIndex].z) * 200.0f;
}
return 0;
}