1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00

Consistent naming for Math_ functions (#542)

* 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

View file

@ -50,7 +50,7 @@ u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void*
this->draw = EffectSsDust_Draw;
if (initParams->drawFlags & 4) {
randColorOffset = Math_Rand_ZeroOne() * 20.0f - 10.0f;
randColorOffset = Rand_ZeroOne() * 20.0f - 10.0f;
this->rPrimColorR = initParams->primColor.r + randColorOffset;
this->rPrimColorG = initParams->primColor.g + randColorOffset;
this->rPrimColorB = initParams->primColor.b + randColorOffset;
@ -131,8 +131,8 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
}
void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f;
this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f;
this->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f;
this->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f;
if ((this->life <= this->rLifespan) && (this->life >= (this->rLifespan - 7))) {
if (this->rLifespan >= 5) {
@ -149,8 +149,8 @@ void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
// this update mode is unused in the original game
void EffectSsBlast_UpdateFire(GlobalContext* globalCtx, u32 index, EffectSs* this) {
this->accel.x = (Math_Rand_ZeroOne() * 0.4f) - 0.2f;
this->accel.z = (Math_Rand_ZeroOne() * 0.4f) - 0.2f;
this->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f;
this->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f;
switch (this->rTexIdx) {
case 0: