mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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

58
src/overlays/actors/ovl_En_Part/z_en_part.c
View file

@ -46,24 +46,24 @@ void func_80ACDDE8(EnPart* this, GlobalContext* globalCtx) {
f32 sign = 1.0f;
this->action = 1;
this->actor.posRot.rot.y = Math_Rand_ZeroOne() * 20000.0f;
this->actor.posRot.rot.y = Rand_ZeroOne() * 20000.0f;
switch (this->actor.params) {
case 0:
this->actor.velocity.y = 0.0f;
this->actor.gravity = -0.3f - Math_Rand_ZeroOne() * 0.5f;
this->actor.gravity = -0.3f - Rand_ZeroOne() * 0.5f;
this->rotZSpeed = 0.3f;
this->timer = 25;
this->actor.speedXZ = (Math_Rand_ZeroOne() - 0.5f) * 2.0f;
this->actor.speedXZ = (Rand_ZeroOne() - 0.5f) * 2.0f;
break;
case 13:
this->timer = 400;
case 12:
this->actor.speedXZ = Math_Rand_CenteredFloat(6.0f);
this->actor.speedXZ = Rand_CenteredFloat(6.0f);
this->actor.initPosRot.pos = this->actor.posRot.pos;
this->timer += 60;
this->actor.velocity.y = Math_Rand_ZeroOne() * 5.0f + 4.0f;
this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.5f;
this->actor.velocity.y = Rand_ZeroOne() * 5.0f + 4.0f;
this->actor.gravity = -0.6f - Rand_ZeroOne() * 0.5f;
this->rotZSpeed = 0.15f;
break;
case 14:
@ -72,19 +72,19 @@ void func_80ACDDE8(EnPart* this, GlobalContext* globalCtx) {
case 4:
case 9:
case 10:
this->timer += (s16)(Math_Rand_ZeroOne() * 17.0f) + 5;
this->timer += (s16)(Rand_ZeroOne() * 17.0f) + 5;
case 2:
this->actor.velocity.y = Math_Rand_ZeroOne() * 5.0f + 4.0f;
this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.5f;
this->actor.velocity.y = Rand_ZeroOne() * 5.0f + 4.0f;
this->actor.gravity = -0.6f - Rand_ZeroOne() * 0.5f;
this->rotZSpeed = 0.15f;
break;
case 11:
EffectSsEnFire_SpawnVec3f(globalCtx, &this->actor, &this->actor.posRot.pos, 40, 0x8001, 0, -1);
case 3:
this->actor.speedXZ = (Math_Rand_ZeroOne() - 0.5f) * 3.0f;
this->timer = (s16)(Math_Rand_ZeroOne() * 17.0f) + 10;
this->actor.velocity.y = Math_Rand_ZeroOne() * 3.0f + 8.0f;
this->actor.gravity = -0.6f - Math_Rand_ZeroOne() * 0.3f;
this->actor.speedXZ = (Rand_ZeroOne() - 0.5f) * 3.0f;
this->timer = (s16)(Rand_ZeroOne() * 17.0f) + 10;
this->actor.velocity.y = Rand_ZeroOne() * 3.0f + 8.0f;
this->actor.gravity = -0.6f - Rand_ZeroOne() * 0.3f;
this->rotZSpeed = 0.15f;
break;
case 5:
@ -143,13 +143,13 @@ void func_80ACE13C(EnPart* this, GlobalContext* globalCtx) {
break;
case 4:
for (i = 7; i >= 0; i--) {
pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(60.0f);
pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(60.0f);
pos.y = this->actor.posRot.pos.y + this->actor.shape.unk_08 * this->actor.scale.y +
Math_Rand_CenteredFloat(50.0f);
pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(60.0f);
velocity.y = Math_Rand_ZeroOne() + 1.0f;
EffectSsDtBubble_SpawnColorProfile(globalCtx, &pos, &velocity, &accel, Math_Rand_S16Offset(80, 100),
25, 0, true);
Rand_CenteredFloat(50.0f);
pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(60.0f);
velocity.y = Rand_ZeroOne() + 1.0f;
EffectSsDtBubble_SpawnColorProfile(globalCtx, &pos, &velocity, &accel, Rand_S16Offset(80, 100), 25,
0, true);
}
break;
case 5:
@ -157,9 +157,9 @@ void func_80ACE13C(EnPart* this, GlobalContext* globalCtx) {
case 7:
case 8:
for (i = 4; i >= 0; i--) {
pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(25.0f);
pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(40.0f);
pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(25.0f);
pos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(25.0f);
pos.y = this->actor.posRot.pos.y + Rand_CenteredFloat(40.0f);
pos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(25.0f);
EffectSsDeadDb_Spawn(globalCtx, &pos, &zeroVec, &zeroVec, 40, 7, 255, 255, 255, 255, 0, 0, 255, 1,
9, true);
}
@ -205,9 +205,9 @@ void func_80ACE5C8(EnPart* this, GlobalContext* globalCtx) {
}
func_80033480(globalCtx, &this->actor.posRot.pos, 0.0f, 1, 300, 150, 1);
velocity.x = Math_Rand_CenteredFloat(16.0f);
velocity.x = Rand_CenteredFloat(16.0f);
EffectSsHahen_Spawn(globalCtx, &this->actor.posRot.pos, &velocity, &accel, 20,
(s32)((Math_Rand_ZeroOne() * 5.0f + 12.0f) * 2), -1, 10, NULL);
(s32)((Rand_ZeroOne() * 5.0f + 12.0f) * 2), -1, 10, NULL);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_MONBLIN_GNDWAVE - SFX_FLAG);
}
}
@ -224,10 +224,10 @@ void func_80ACE7E8(EnPart* this, GlobalContext* globalCtx) {
if (this->timer == 0) {
f32 diffsSum =
Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f, 5.0f, 0.0f);
diffsSum += Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 1.0f, 5.0f, 0.0f);
diffsSum += Math_SmoothScaleMaxMinF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f, 5.0f, 0.0f);
diffsSum += Math_SmoothScaleMaxMinF(&this->rotZ, 0.0f, 1.0f, 0.25f, 0.0f);
Math_SmoothStepToF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 1.0f, 5.0f, 0.0f);
diffsSum += Math_SmoothStepToF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 1.0f, 5.0f, 0.0f);
diffsSum += Math_SmoothStepToF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 1.0f, 5.0f, 0.0f);
diffsSum += Math_SmoothStepToF(&this->rotZ, 0.0f, 1.0f, 0.25f, 0.0f);
if (diffsSum == 0.0f) {
this->actor.parent->initPosRot.rot.x--;
this->timer--;
@ -254,7 +254,7 @@ void EnPart_Update(Actor* thisx, GlobalContext* globalCtx) {
if ((this->actor.params > 4 && this->actor.params < 9) || this->actor.params < 0) {
func_8002E4B4(globalCtx, &this->actor, 5.0f, 15.0f, 0.0f, 5);
if (this->actor.params >= 0) {
Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f);
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f);
if (thisx->bgCheckFlags & 1) {
thisx->bgCheckFlags &= ~1;
thisx->velocity.y = 6.0f;