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

20
src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
View file

@ -128,9 +128,9 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) {
spawnParams = LEEVER_BIG;
}
spawnPos.x = player->actor.posRot.pos.x + Math_Sins(spawnAngle) * spawnDist;
spawnPos.x = player->actor.posRot.pos.x + Math_SinS(spawnAngle) * spawnDist;
spawnPos.y = player->actor.groundY + 120.0f;
spawnPos.z = player->actor.posRot.pos.z + Math_Coss(spawnAngle) * spawnDist;
spawnPos.z = player->actor.posRot.pos.z + Math_CosS(spawnAngle) * spawnDist;
floorY = func_8003C9A4(&globalCtx->colCtx, &floorPoly, &bgId, &this->actor, &spawnPos);
if (floorY <= -32000.0f) {
@ -159,9 +159,9 @@ void EnEncount1_SpawnLeevers(EnEncount1* this, GlobalContext* globalCtx) {
this->bigLeever = leever;
}
if (!this->reduceLeevers) {
this->maxCurSpawns = (s16)Math_Rand_ZeroFloat(3.99f) + 2;
this->maxCurSpawns = (s16)Rand_ZeroFloat(3.99f) + 2;
} else {
this->maxCurSpawns = (s16)Math_Rand_ZeroFloat(2.99f) + 1;
this->maxCurSpawns = (s16)Rand_ZeroFloat(2.99f) + 1;
}
} else {
// Cannot spawn!
@ -190,9 +190,9 @@ void EnEncount1_SpawnTektites(EnEncount1* this, GlobalContext* globalCtx) {
} else {
this->outOfRangeTimer = 0;
if ((this->curNumSpawn < this->maxCurSpawns) && (this->totalNumSpawn < this->maxTotalSpawns)) {
spawnPos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(50.0f);
spawnPos.x = this->actor.posRot.pos.x + Rand_CenteredFloat(50.0f);
spawnPos.y = this->actor.posRot.pos.y + 120.0f;
spawnPos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(50.0f);
spawnPos.z = this->actor.posRot.pos.z + Rand_CenteredFloat(50.0f);
floorY = func_8003C9A4(&globalCtx->colCtx, &floorPoly, &bgId, &this->actor, &spawnPos);
if (floorY <= -32000.0f) {
return;
@ -256,17 +256,17 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, GlobalContext* globalCt
break;
}
spawnDist = Math_Rand_CenteredFloat(40.0f) + 200.0f;
spawnDist = Rand_CenteredFloat(40.0f) + 200.0f;
spawnAngle = player->actor.shape.rot.y;
if (this->curNumSpawn != 0) {
spawnAngle = -spawnAngle;
spawnDist = Math_Rand_CenteredFloat(40.0f) + 100.0f;
spawnDist = Rand_CenteredFloat(40.0f) + 100.0f;
}
spawnPos.x =
player->actor.posRot.pos.x + (Math_Sins(spawnAngle) * spawnDist) + Math_Rand_CenteredFloat(40.0f);
player->actor.posRot.pos.x + (Math_SinS(spawnAngle) * spawnDist) + Rand_CenteredFloat(40.0f);
spawnPos.y = player->actor.groundY + 120.0f;
spawnPos.z =
player->actor.posRot.pos.z + (Math_Coss(spawnAngle) * spawnDist) + Math_Rand_CenteredFloat(40.0f);
player->actor.posRot.pos.z + (Math_CosS(spawnAngle) * spawnDist) + Rand_CenteredFloat(40.0f);
floorY = func_8003C9A4(&globalCtx->colCtx, &floorPoly, &bgId, &this->actor, &spawnPos);
if (floorY <= -32000.0f) {
break;