1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-10 08:50:23 +00:00

Clean up some float literals (#972)

* floats are fun

* more cleanup

* one more bit

* format

* merge kankyo

* Update src/overlays/actors/ovl_En_Horse/z_en_horse.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Mm/z_en_mm.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
petrie911 2021-11-01 18:29:47 -05:00 committed by GitHub
parent 8e57f3bca3
commit cb43f256f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 352 additions and 347 deletions

View file

@ -1615,7 +1615,7 @@ void BossGoma_FloorMain(BossGoma* this, GlobalContext* globalCtx) {
BossGoma_SetupFloorAttackPosture(this);
}
Math_ApproachF(&this->actor.speedXZ, 3.3333333f, 0.5f, 2.0f);
Math_ApproachF(&this->actor.speedXZ, 10.0f / 3.0f, 0.5f, 2.0f);
Math_ApproachS(&this->actor.world.rot.y, rot, 5, 0x3E8);
} else {
if (this->timer != 0) {
@ -1627,7 +1627,7 @@ void BossGoma_FloorMain(BossGoma* this, GlobalContext* globalCtx) {
}
} else {
// move away from the player, walking forwards
Math_ApproachF(&this->actor.speedXZ, 6.6666665f, 0.5f, 2.0f);
Math_ApproachF(&this->actor.speedXZ, 20.0f / 3.0f, 0.5f, 2.0f);
this->skelanime.playSpeed = 2.0f;
rot += 0x8000;
}