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

4
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
View file

@ -285,7 +285,7 @@ void ObjTsubo_LiftedUp(ObjTsubo* this, PlayState* play) {
this->actor.room = play->roomCtx.curRoom.num;
ObjTsubo_SetupThrown(this);
ObjTsubo_ApplyGravity(this);
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 5.0f, 15.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_7);
}
@ -318,7 +318,7 @@ void ObjTsubo_Thrown(ObjTsubo* this, PlayState* play) {
Actor_Kill(&this->actor);
} else {
ObjTsubo_ApplyGravity(this);
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
Math_StepToS(&D_80BA1B54, D_80BA1B50, 0x64);
Math_StepToS(&D_80BA1B5C, D_80BA1B58, 0x64);
this->actor.shape.rot.x += D_80BA1B54;