mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Name movement related functions in z_actor (#1476)

Browse source 
* rename functions

* dragorns name suggestions

* Revert "dragorns name suggestions"

This reverts commit dd4626ce5e.

* lets try that again

* reword comment

* comments

* projectile speed

* arg name

* more comments

* minVelY comment

* merge master and format
This commit is contained in:
fig02 2022-12-30 13:55:14 -05:00 • committed by GitHub
parent 41e80b951b
commit e37b993483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
191 changed files with 349 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
View file

@ -415,12 +415,12 @@ void EnHonotrap_FlameChase(EnHonotrap* this, PlayState* play) {
Math_ScaledStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0x300);
Math_StepToF(&this->actor.speed, 3.0f, 0.1f);
this->actor.gravity = (-this->actor.yDistToPlayer < 10.0f) ? 0.08f : -0.08f;
func_8002D868(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
if (this->actor.velocity.y > 1.0f) {
this->actor.velocity.y = 1.0f;
}
this->actor.velocity.y *= 0.95f;
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 7.0f, 10.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);
@ -451,7 +451,7 @@ void EnHonotrap_FlameVanish(EnHonotrap* this, PlayState* play) {
s32 ready = Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f);
this->actor.scale.z = this->actor.scale.y = this->actor.scale.x;
Actor_MoveForward(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 7.0f, 10.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);