1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00

Name movement related functions in z_actor (#1476)

* 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

View file

@ -395,7 +395,7 @@ void EnIshi_LiftedUp(EnIshi* this, PlayState* play) {
EnIshi_SetupFly(this);
EnIshi_Fall(this);
func_80A7ED94(&this->actor.velocity, D_80A7FA28[this->actor.params & 1]);
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 7.5f, 35.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_6 |
UPDBGCHECKINFO_FLAG_7);
@ -464,7 +464,7 @@ void EnIshi_Fly(EnIshi* this, PlayState* play) {
Math_StepToF(&this->actor.shape.yOffset, 0.0f, 2.0f);
EnIshi_Fall(this);
func_80A7ED94(&this->actor.velocity, D_80A7FA28[type]);
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
this->actor.shape.rot.x += sRotSpeedX;
this->actor.shape.rot.y += sRotSpeedY;
Actor_UpdateBgCheckInfo(play, &this->actor, 7.5f, 35.0f, 0.0f,