mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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

12
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -791,12 +791,12 @@ void func_80AEC40C(EnRu1* this) {
this->actor.speed = (kREG(3) * 0.01f) + 2.7f;
}
this->actor.velocity.y = -1.0f;
Actor_MoveForward(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void func_80AEC4CC(EnRu1* this) {
this->actor.velocity.y = -1.0f;
Actor_MoveForward(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void func_80AEC4F4(EnRu1* this) {
@ -811,7 +811,7 @@ void func_80AEC4F4(EnRu1* this) {
*speedXZ = 0.0f;
this->actor.velocity.y = -((kREG(4) * 0.01f) + 13.0f);
}
Actor_MoveForward(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
s32 func_80AEC5FC(EnRu1* this, PlayState* play) {
@ -1426,7 +1426,7 @@ void func_80AEDEF4(EnRu1* this, PlayState* play) {
void func_80AEDFF4(EnRu1* this, PlayState* play) {
func_80AEDB30(this, play);
func_80AEDEF4(this, play);
Actor_MoveForward(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void func_80AEE02C(EnRu1* this) {
@ -1466,7 +1466,7 @@ void func_80AEE050(EnRu1* this) {
}
this->actor.velocity.x = Math_SinS(this->actor.world.rot.y) * this->actor.speed;
this->actor.velocity.z = Math_CosS(this->actor.world.rot.y) * this->actor.speed;
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
}
} else {
if (this->unk_350 == 1) {
@ -1731,7 +1731,7 @@ void func_80AEECF0(EnRu1* this, PlayState* play) {
void func_80AEED58(EnRu1* this, PlayState* play) {
func_80AED83C(this);
func_80AEAECC(this, play);
Actor_MoveForward(&this->actor);
Actor_MoveXZGravity(&this->actor);
EnRu1_UpdateSkelAnime(this);
EnRu1_UpdateEyes(this);
func_80AEEAC8(this, play);