mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-14 04:07:06 +00:00
Code Issues Projects Releases Wiki Activity

dragorns name suggestions

Browse source
This commit is contained in:
fig02 2022-12-22 05:53:41 -05:00
parent 2eb0845770
commit dd4626ce5e
174 changed files with 260 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/functions.h
View file

@ -360,10 +360,10 @@ void Actor_SetScale(Actor* actor, f32 scale);
void Actor_SetObjectDependency(PlayState* play, Actor* actor);
void Actor_UpdatePos(Actor* actor);
void Actor_UpdateVelocityWithGravity(Actor* actor);
void Actor_MoveWithGravity(Actor* actor);
void Actor_UpdateVelocityWithoutGravity(Actor* actor);
void Actor_MoveWithoutGravity(Actor* actor);
void func_8002D9A4(Actor* actor, f32 speed);
void Actor_MoveXZGravity(Actor* actor);
void Actor_UpdateVelocityXYZ(Actor* actor);
void Actor_MoveXYZ(Actor* actor);
void Actor_SetSpeedXYZ(Actor* actor, f32 speed);
s16 Actor_WorldYawTowardActor(Actor* actorA, Actor* actorB);
s16 Actor_WorldYawTowardPoint(Actor* actor, Vec3f* refPoint);
f32 Actor_WorldDistXYZToActor(Actor* actorA, Actor* actorB);

24
src/code/z_actor.c
View file

@ -855,7 +855,7 @@ void Actor_UpdatePos(Actor* actor) {
/**
* Update actor's velocity accounting for gravity (without exceeding terminal velocity)
*/
void Actor_UpdateVelocityWithGravity(Actor* actor) {
void Actor_UpdateVelocityXZGravity(Actor* actor) {
actor->velocity.x = Math_SinS(actor->world.rot.y) * actor->speedXZ;
actor->velocity.z = Math_CosS(actor->world.rot.y) * actor->speedXZ;
@ -870,32 +870,32 @@ void Actor_UpdateVelocityWithGravity(Actor* actor) {
* Move actor while accounting for its current velocity and gravity.
* The actor will move in the direction of its world yaw.
*/
void Actor_MoveWithGravity(Actor* actor) {
Actor_UpdateVelocityWithGravity(actor);
void Actor_MoveXZGravity(Actor* actor) {
Actor_UpdateVelocityXZGravity(actor);
Actor_UpdatePos(actor);
}
/**
* Update actor's velocity without gravity.
*/
void Actor_UpdateVelocityWithoutGravity(Actor* actor) {
f32 sp24 = Math_CosS(actor->world.rot.x) * actor->speedXZ;
void Actor_UpdateVelocityXYZ(Actor* actor) {
f32 speedXZ = Math_CosS(actor->world.rot.x) * actor->speedXZ;
actor->velocity.x = Math_SinS(actor->world.rot.y) * sp24;
actor->velocity.x = Math_SinS(actor->world.rot.y) * speedXZ;
actor->velocity.y = Math_SinS(actor->world.rot.x) * actor->speedXZ;
actor->velocity.z = Math_CosS(actor->world.rot.y) * sp24;
actor->velocity.z = Math_CosS(actor->world.rot.y) * speedXZ;
}
/**
* Move actor while accounting for its current velocity.
* Move actor while accounting for its current velocity without gravity.
* The actor will move in the direction of its world yaw and pitch.
*/
void Actor_MoveWithoutGravity(Actor* actor) {
Actor_UpdateVelocityWithoutGravity(actor);
void Actor_MoveXYZ(Actor* actor) {
Actor_UpdateVelocityXYZ(actor);
Actor_UpdatePos(actor);
}
void func_8002D9A4(Actor* actor, f32 speed) {
void Actor_SetSpeedXYZ(Actor* actor, f32 speed) {
actor->speedXZ = Math_CosS(actor->world.rot.x) * speed;
actor->velocity.y = -Math_SinS(actor->world.rot.x) * speed;
}
@ -4109,7 +4109,7 @@ s32 func_80035124(Actor* actor, PlayState* play) {
if (Actor_HasParent(actor, play)) {
actor->params = 1;
} else if (!(actor->bgCheckFlags & BGCHECKFLAG_GROUND)) {
Actor_MoveWithGravity(actor);
Actor_MoveXZGravity(actor);
Math_SmoothStepToF(&actor->speedXZ, 0.0f, 1.0f, 0.1f, 0.0f);
} else if ((actor->bgCheckFlags & BGCHECKFLAG_GROUND_TOUCH) && (actor->velocity.y < -4.0f)) {
ret = 1;

2
src/code/z_en_a_keep.c
View file

@ -312,7 +312,7 @@ void EnAObj_Update(Actor* thisx, PlayState* play) {
EnAObj* this = (EnAObj*)thisx;
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
if (this->dyna.actor.gravity != 0.0f) {
if (this->dyna.actor.params != A_OBJ_BOULDER_FRAGMENT) {

2
src/code/z_en_item00.c
View file

@ -576,7 +576,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) {
} else {
sp3A = 1;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
if (sp3A || D_80157D94[0]) {

4
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -87,7 +87,7 @@ void ArmsHook_Wait(ArmsHook* this, PlayState* play) {
s32 length = (player->heldItemAction == PLAYER_IA_HOOKSHOT) ? 13 : 26;
ArmsHook_SetupAction(this, ArmsHook_Shoot);
func_8002D9A4(&this->actor, 20.0f);
Actor_SetSpeedXYZ(&this->actor, 20.0f);
this->actor.parent = &GET_PLAYER(play)->actor;
this->timer = length;
}
@ -250,7 +250,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) {
}
}
} else {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Math_Vec3f_Diff(&this->actor.world.pos, &this->actor.prevPos, &prevFrameDiff);
Math_Vec3f_Sum(&this->unk_1E8, &prevFrameDiff, &this->unk_1E8);
this->actor.shape.rot.x = Math_Atan2S(this->actor.speedXZ, -this->actor.velocity.y);

2
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View file

@ -855,7 +855,7 @@ void BgDyYoseizo_Update(Actor* thisx, PlayState* play2) {
}
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->heightOffset = this->scale * 7500.0f;
Actor_SetFocus(&this->actor, this->heightOffset);
this->actor.focus.pos.y = this->heightOffset;

2
src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
View file

@ -190,7 +190,7 @@ void BgHakaShip_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->dyna.actor.params == 0) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
}
}

2
src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
View file

@ -395,7 +395,7 @@ void BgHakaZou_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->dyna.actor.params == 3) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
}
}

4
src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
View file

@ -382,7 +382,7 @@ void BgHeavyBlock_Fly(BgHeavyBlock* this, PlayState* play) {
Vec3f checkPos;
f32 yIntersect;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
checkPos.x = this->dyna.actor.home.pos.x;
checkPos.y = this->dyna.actor.home.pos.y + 1000.0f;
checkPos.z = this->dyna.actor.home.pos.z;
@ -455,7 +455,7 @@ void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play) {
Math_StepToF(&this->dyna.actor.velocity.y, 0.0f, 3.0f);
this->dyna.actor.gravity = 0.0f;
this->dyna.actor.world.pos = this->dyna.actor.home.pos;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->dyna.actor.home.pos = this->dyna.actor.world.pos;
switch (this->dyna.actor.params & 0xFF) {
case HEAVYBLOCK_UNBREAKABLE_OUTSIDE_CASTLE:

2
src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
View file

@ -181,7 +181,7 @@ void BgHidanDalm_Update(Actor* thisx, PlayState* play) {
BgHidanDalm* this = (BgHidanDalm*)thisx;
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 10.0f, 15.0f, 32.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
}

4
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View file

@ -294,7 +294,7 @@ void func_80888860(BgHidanHamstep* this, PlayState* play) {
s32 pad2;
s32 quakeIndex;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
if (((this->dyna.actor.world.pos.y - this->dyna.actor.home.pos.y) < (-20.0f - this->dyna.actor.minVelocityY)) &&
(this->dyna.actor.velocity.y <= 0.0f)) {
@ -344,7 +344,7 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) {
s32 pad2;
s32 quakeIndex;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
func_80888694(this, (BgHidanHamstep*)this->dyna.actor.parent);
if (((this->dyna.actor.params & 0xFF) <= 0) || ((this->dyna.actor.params & 0xFF) >= 6)) {

2
src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
View file

@ -124,7 +124,7 @@ void func_80889C18(BgHidanKousi* this, PlayState* play) {
this->dyna.actor.speedXZ = 2.0f;
BgHidanKousi_SetupAction(this, func_80889C90);
}
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
func_8002F974(&this->dyna.actor, NA_SE_EV_METALDOOR_SLIDE - SFX_FLAG);
}

2
src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
View file

@ -332,7 +332,7 @@ void BgHidanRock_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->actionFunc == func_8088B79C) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
}

2
src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c
View file

@ -173,7 +173,7 @@ void BgIceTurara_Fall(BgIceTurara* this, PlayState* play) {
return;
}
} else {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->dyna.actor.world.pos.y += 40.0f;
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
this->dyna.actor.world.pos.y -= 40.0f;

4
src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
View file

@ -148,7 +148,7 @@ void BgJyaHaheniron_SetupChairCrumble(BgJyaHaheniron* this) {
void BgJyaHaheniron_ChairCrumble(BgJyaHaheniron* this, PlayState* play) {
Vec3f vec;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 5.0f, 8.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_7);
if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_WALL)) ||
@ -174,7 +174,7 @@ void BgJyaHaheniron_SetupPillarCrumble(BgJyaHaheniron* this) {
void BgJyaHaheniron_PillarCrumble(BgJyaHaheniron* this, PlayState* play) {
if (this->timer >= 8) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
} else if (this->timer >= 17) {
BgJyaHaheniron_SpawnFragments(play, &this->actor.world.pos, D_808987A0);
Actor_Kill(&this->actor);

2
src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
View file

@ -329,7 +329,7 @@ void func_8089E650(BgMizuMovebg* this, PlayState* play) {
this->dyna.actor.speedXZ = dist;
}
func_80035844(&this->dyna.actor.world.pos, &waypoint, &this->dyna.actor.world.rot, 1);
Actor_MoveWithoutGravity(&this->dyna.actor);
Actor_MoveXYZ(&this->dyna.actor);
dx = waypoint.x - this->dyna.actor.world.pos.x;
dy = waypoint.y - this->dyna.actor.world.pos.y;
dz = waypoint.z - this->dyna.actor.world.pos.z;

2
src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
View file

@ -158,7 +158,7 @@ void BgMoriBigst_SetupFall(BgMoriBigst* this, PlayState* play) {
}
void BgMoriBigst_Fall(BgMoriBigst* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
if (this->dyna.actor.world.pos.y <= this->dyna.actor.home.pos.y) {
this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
BgMoriBigst_SetupLanding(this, play);

2
src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
View file

@ -243,7 +243,7 @@ void BgMoriHashigo_LadderFall(BgMoriHashigo* this, PlayState* play) {
static f32 bounceSpeed[3] = { 4.0f, 2.7f, 1.7f };
Actor* thisx = &this->dyna.actor;
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
if ((thisx->bgCheckFlags & BGCHECKFLAG_GROUND) && (thisx->velocity.y < 0.0f)) {
if (this->bounceCounter >= ARRAY_COUNT(bounceSpeed)) {
BgMoriHashigo_SetupLadderRest(this);

2
src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
View file

@ -149,7 +149,7 @@ void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, PlayState* play) {
Actor* thisx = &this->dyna.actor;
s32 quakeIndex;
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
if ((thisx->velocity.y < 0.0f) && (thisx->world.pos.y <= 403.0f)) {
if (this->bounceCount >= ARRAY_COUNT(bounceVel)) {
BgMoriRakkatenjo_SetupRest(this);

2
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View file

@ -64,7 +64,7 @@ void BgPushbox_UpdateImpl(BgPushbox* this, PlayState* play) {
: ((this->dyna.actor.speedXZ > 1.0f) ? 1.0f : this->dyna.actor.speedXZ);
Math_StepToF(&this->dyna.actor.speedXZ, 0.0f, 0.2f);
this->dyna.actor.world.rot.y = this->dyna.unk_158;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 20.0f, 40.0f, 40.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
View file

@ -319,7 +319,7 @@ void func_808B43D0(BgSpot15Rrbox* this, PlayState* play) {
player->stateFlags2 &= ~PLAYER_STATE2_4;
}
Actor_MoveWithGravity(actor);
Actor_MoveXZGravity(actor);
if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) {
// "Lon Lon wooden crate fell too much"

2
src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
View file

@ -500,7 +500,7 @@ void func_808B5B58(BgSpot16Bombstone* this) {
void func_808B5B6C(BgSpot16Bombstone* this, PlayState* play) {
Actor* actor = &this->actor;
Actor_MoveWithGravity(actor);
Actor_MoveXZGravity(actor);
actor->shape.rot.x += this->unk_210;
actor->shape.rot.z += this->unk_212;

2
src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
View file

@ -247,7 +247,7 @@ void func_808B8F08(BgSpot18Obj* this, PlayState* play) {
Player* player = GET_PLAYER(play);
Math_StepToF(&this->dyna.actor.speedXZ, 1.2f, 0.1f);
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
func_808B8DDC(this, play);
if (Math3D_Dist2DSq(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.z, this->dyna.actor.home.pos.x,

2
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -868,7 +868,7 @@ void BossDodongo_Update(Actor* thisx, PlayState* play2) {
thisx->shape.rot.y = thisx->world.rot.y;
Math_SmoothStepToF(&thisx->shape.yOffset, this->unk_228, 1.0f, 100.0f, 0.0f);
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
BossDodongo_UpdateDamage(this, play);
Actor_UpdateBgCheckInfo(play, thisx, 10.0f, 10.0f, 20.0f, UPDBGCHECKINFO_FLAG_2);
Math_SmoothStepToF(&this->unk_208, 0, 1, 0.001f, 0.0);

2
src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View file

@ -939,7 +939,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) {
Math_ApproachF(&this->fwork[BFD_TURN_RATE], this->fwork[BFD_TURN_RATE_MAX], 1.0f, 20000.0f);
Math_ApproachF(&this->actor.speedXZ, this->fwork[BFD_FLY_SPEED], 1.0f, 0.1f);
if (this->work[BFD_ACTION_STATE] < BOSSFD_SKULL_FALL) {
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
}
Actor_UpdatePos(&this->actor);

10
src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file

@ -3921,7 +3921,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) {
yDistFromLink = (player->actor.world.pos.y + 40.0f) - this->actor.world.pos.y;
zDistFromLink = player->actor.world.pos.z - this->actor.world.pos.z;
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
switch (this->unk_1C2) {
@ -4195,7 +4195,7 @@ void func_808E1EB4(Actor* thisx, PlayState* play2) {
}
}
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
this->unk_1A6++;
@ -4322,7 +4322,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
}
}
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
this->unk_1A6++;
@ -4412,7 +4412,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
(this->actor.xzDistToPlayer < 80.0f)) {
this->unk_1C2 = 0xC;
this->actor.speedXZ = -30.0f;
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
this->unk_1F0 = dorf->unk_1FC;
numEffects = 10;
@ -4429,7 +4429,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
this->unk_1C2 = 0xC;
this->actor.speedXZ = -30.0f;
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
this->unk_1F0.x = Rand_CenteredFloat(700.0f) + dorf->unk_1FC.x;

2
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -1997,7 +1997,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) {
if (this->unk_392 != 0) {
this->unk_392--;
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actor.shape.rot = this->actor.world.rot;
if (this->unk_335 != 0) {
Actor_UpdateBgCheckInfo(play, &this->actor, 60.0f, 60.0f, 100.0f,

6
src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View file

@ -761,7 +761,7 @@ void BossGanondrof_Stunned(BossGanondrof* this, PlayState* play) {
this->actor.gravity = 0.0f;
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void BossGanondrof_SetupBlock(BossGanondrof* this, PlayState* play) {
@ -847,7 +847,7 @@ void BossGanondrof_Charge(BossGanondrof* this, PlayState* play) {
thisx->world.rot.x = RAD_TO_BINANG(Math_FAtan2F(vecToLink.y, sqrtf(SQ(vecToLink.x) + SQ(vecToLink.z))));
}
Actor_UpdateVelocityWithoutGravity(thisx);
Actor_UpdateVelocityXYZ(thisx);
Actor_UpdatePos(thisx);
Math_ApproachF(&thisx->speedXZ, 10.0f, 1.0f, 0.5f);
if ((sqrtf(SQ(dxCenter) + SQ(dzCenter)) > 280.0f) || (thisx->xyzDistToPlayerSq < SQ(100.0f))) {
@ -857,7 +857,7 @@ void BossGanondrof_Charge(BossGanondrof* this, PlayState* play) {
break;
case CHARGE_FINISH:
thisx->gravity = 0.2f;
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
osSyncPrintf("YP %f @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n", thisx->world.pos.y);
if (thisx->world.pos.y < 5.0f) {
thisx->world.pos.y = 5.0f;

2
src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View file

@ -1921,7 +1921,7 @@ void BossGoma_Update(Actor* thisx, PlayState* play) {
this->actor.shape.rot.y = this->actor.world.rot.y;
if (!this->doNotMoveThisFrame) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
} else {
this->doNotMoveThisFrame = false;
}

6
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -1473,7 +1473,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
this->subCamAtVel.z * this->subCamVelFactor);
Math_ApproachF(&this->subCamVelFactor, 1.0f, 1.0f, this->subCamAccel);
} else if (this->csState < MO_INTRO_REVEAL) {
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
this->subCamEye.x += this->actor.velocity.x;
this->subCamEye.y += this->actor.velocity.y;
this->subCamEye.z += this->actor.velocity.z;
@ -2139,7 +2139,7 @@ void BossMo_Core(BossMo* this, PlayState* play) {
spD0 = RAD_TO_BINANG(Math_FAtan2F(spD8, sqrtf(SQ(spDC) + SQ(spD4))));
Math_ApproachS(&this->actor.world.rot.y, spCC, this->tentMaxAngle, this->tentSpeed);
Math_ApproachS(&this->actor.world.rot.x, spD0, this->tentMaxAngle, this->tentSpeed);
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
} else {
this->actor.world.pos.y += this->actor.velocity.y;
this->actor.velocity.y -= 1.0f;
@ -2321,7 +2321,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) {
}
}
Math_ApproachS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0xA, 0xC8);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Math_ApproachF(&this->actor.speedXZ, 0.0, 1.0f, 0.02f);
if (BossMo_NearLand(&this->actor.world.pos, 40)) {

12
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -626,7 +626,7 @@ void BossTw_TurnToPlayer(BossTw* this, PlayState* play) {
Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, this->rotateSpeed);
Math_ApproachS(&this->actor.shape.rot.x, 0, 5, this->rotateSpeed);
Math_ApproachF(&this->rotateSpeed, 4096.0f, 1.0f, 200.0f);
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
if (this->timers[0] == 0) {
if ((otherTw->actionFunc != BossTw_ShootBeam) && this->work[CAN_SHOOT]) {
@ -698,7 +698,7 @@ void BossTw_FlyTo(BossTw* this, PlayState* play) {
Math_ApproachS(&this->actor.shape.rot.x, pitchTarget, 0xA, this->rotateSpeed);
Math_ApproachF(&this->rotateSpeed, 4096.0f, 1.0f, 100.0f);
Math_ApproachF(&this->actor.speedXZ, 10.0f, 1.0f, 1.0f);
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
if ((this->timers[0] == 0) || (xzDist < 70.0f)) {
@ -2363,7 +2363,7 @@ void BossTw_DeathBall(BossTw* this, PlayState* play) {
Math_ApproachS(&this->actor.world.rot.x, RAD_TO_BINANG(Math_FAtan2F(yDiff, sqrtf(SQ(xDiff) + SQ(zDiff)))), 5,
this->rotateSpeed);
Math_ApproachS(&this->actor.world.rot.y, yaw, 5, this->rotateSpeed);
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
}
@ -3936,7 +3936,7 @@ void BossTw_BlastFire(BossTw* this, PlayState* play) {
case 10:
this->blastActive = true;
if (this->timers[0] == 0) {
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
Actor_PlaySfx(&this->actor, NA_SE_EN_TWINROBA_SHOOT_FIRE & ~SFX_FLAG);
} else {
@ -4125,7 +4125,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) {
this->blastActive = true;
if (this->timers[0] == 0) {
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
Actor_PlaySfx(&this->actor, NA_SE_EN_TWINROBA_SHOOT_FREEZE - SFX_FLAG);
} else {
@ -5404,7 +5404,7 @@ void BossTw_TwinrovaFly(BossTw* this, PlayState* play) {
Math_ApproachS(&this->actor.shape.rot.y, yaw, 0xA, this->rotateSpeed);
Math_ApproachF(&this->rotateSpeed, 2000.0f, 1.0f, 100.0f);
Math_ApproachF(&this->actor.speedXZ, 30.0f, 1.0f, 2.0f);
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Math_ApproachF(&this->actor.world.pos.x, this->targetPos.x, 0.1f, fabsf(this->actor.velocity.x) * 1.5f);
Math_ApproachF(&this->actor.world.pos.y, this->targetPos.y, 0.1f, fabsf(this->actor.velocity.y) * 1.5f);
Math_ApproachF(&this->targetPos.y, 380.0f, 1.0f, 2.0f);

4
src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View file

@ -1283,7 +1283,7 @@ void BossVa_BodyPhase3(BossVa* this, PlayState* play) {
this->actor.speedXZ = 0.0f;
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (SkelAnime_Update(&this->skelAnime) && (sFightPhase >= PHASE_4)) {
BossVa_SetupBodyPhase4(this, play);
}
@ -1482,7 +1482,7 @@ void BossVa_BodyPhase4(BossVa* this, PlayState* play) {
}
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actor.focus.pos = this->actor.world.pos;
this->actor.focus.pos.y += 60.0f;
if (((play->gameplayFrames % 2) == 0) && (this->timer == 0)) {

2
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -938,7 +938,7 @@ void DemoEffect_UpdateLightRingTriforce(DemoEffect* this, PlayState* play) {
void DemoEffect_UpdateCreationFireball(DemoEffect* this, PlayState* play) {
DemoEffect* effect;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actor.speedXZ = this->actor.speedXZ + (this->actor.gravity * 0.5f);
if (this->fireBall.timer != 0) {

14
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View file

@ -568,7 +568,7 @@ void DemoGj_InitRubblePile1(DemoGj* this, PlayState* play) {
}
void func_8097A000(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(18));
this->rotationVec.y += (s16)(kREG(19) + 1000);
@ -633,7 +633,7 @@ void DemoGj_InitRubblePile2(DemoGj* this, PlayState* play) {
}
void func_8097A238(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(31));
this->rotationVec.y += (s16)(kREG(32) + 1000);
@ -698,7 +698,7 @@ void DemoGj_InitRubblePile3(DemoGj* this, PlayState* play) {
}
void func_8097A474(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(44));
this->rotationVec.y += (s16)(kREG(45) + 1000);
@ -746,7 +746,7 @@ void DemoGj_InitRubblePile4(DemoGj* this, PlayState* play) {
}
void func_8097A644(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(57));
this->rotationVec.y += (s16)(kREG(58) + 1000);
@ -794,7 +794,7 @@ void DemoGj_InitRubblePile5(DemoGj* this, PlayState* play) {
}
void func_8097A814(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(70));
this->rotationVec.y += (s16)(kREG(71) + 1000);
@ -842,7 +842,7 @@ void DemoGj_InitRubblePile6(DemoGj* this, PlayState* play) {
}
void func_8097A9E4(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(83));
this->rotationVec.y += (s16)(kREG(84) + 1000);
@ -890,7 +890,7 @@ void DemoGj_InitRubblePile7(DemoGj* this, PlayState* play) {
}
void func_8097ABB4(DemoGj* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->rotationVec.x += (s16)(kREG(15));
this->rotationVec.y += (s16)(kREG(14) + 1000);

4
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -158,11 +158,11 @@ void func_8097CC08(DemoGo* this) {
} else {
this->actor.speedXZ = (kREG(15) * 0.01f) + 1.2f;
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void func_8097CCC0(DemoGo* this) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void func_8097CCE0(DemoGo* this, PlayState* play) {

2
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
View file

@ -866,7 +866,7 @@ void DoorShutter_WaitPlayerSurprised(DoorShutter* this, PlayState* play) {
}
void DoorShutter_GohmaBlockFall(DoorShutter* this, PlayState* play) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
if (this->dyna.actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
DoorShutter_SetupAction(this, DoorShutter_GohmaBlockBounce);

6
src/overlays/actors/ovl_En_Am/z_en_am.c
View file

@ -532,7 +532,7 @@ void EnAm_MoveToHome(EnAm* this, PlayState* play) {
// turn away from a wall if touching one
if ((this->dyna.actor.speedXZ != 0.0f) && (this->dyna.actor.bgCheckFlags & BGCHECKFLAG_WALL)) {
this->dyna.actor.world.rot.y = this->dyna.actor.wallYaw;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
}
SkelAnime_Update(&this->skelAnime);
@ -640,7 +640,7 @@ void EnAm_Lunge(EnAm* this, PlayState* play) {
if ((this->dyna.actor.speedXZ != 0.0f) && (this->dyna.actor.bgCheckFlags & BGCHECKFLAG_WALL)) {
this->dyna.actor.world.rot.y =
(this->dyna.actor.wallYaw - this->dyna.actor.world.rot.y) + this->dyna.actor.wallYaw;
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
this->dyna.actor.bgCheckFlags &= ~BGCHECKFLAG_WALL;
}
@ -885,7 +885,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) {
}
}
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 20.0f, 28.0f, 80.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Ani/z_en_ani.c
View file

@ -238,7 +238,7 @@ void EnAni_Update(Actor* thisx, PlayState* play) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[0] != NULL)) {
switch (this->unk_2AA) {

8
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -183,11 +183,11 @@ void EnArrow_Shoot(EnArrow* this, PlayState* play) {
Math_Vec3f_Copy(&this->unk_210, &this->actor.world.pos);
if (this->actor.params >= ARROW_SEED) {
func_8002D9A4(&this->actor, 80.0f);
Actor_SetSpeedXYZ(&this->actor, 80.0f);
this->timer = 15;
this->actor.shape.rot.x = this->actor.shape.rot.y = this->actor.shape.rot.z = 0;
} else {
func_8002D9A4(&this->actor, 150.0f);
Actor_SetSpeedXYZ(&this->actor, 150.0f);
this->timer = 12;
}
}
@ -325,7 +325,7 @@ void EnArrow_Fly(EnArrow* this, PlayState* play) {
}
} else {
Math_Vec3f_Copy(&this->unk_210, &this->actor.world.pos);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if ((this->touchedPoly =
BgCheck_ProjectileLineTest(&play->colCtx, &this->actor.prevPos, &this->actor.world.pos, &hitPoint,
@ -377,7 +377,7 @@ void func_809B45E0(EnArrow* this, PlayState* play) {
void func_809B4640(EnArrow* this, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (DECR(this->timer) == 0) {
Actor_Kill(&this->actor);

4
src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c
View file

@ -332,9 +332,9 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) {
UPDBGCHECKINFO_FLAG_4);
if (this->actionFunc == func_809B5670) {
Actor_MoveWithoutGravity(&this->actor);
Actor_MoveXYZ(&this->actor);
} else {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
if (this->actor.floorHeight <= BGCHECK_Y_MIN) {

2
src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -212,7 +212,7 @@ void EnBa_FallAsBlob(EnBa* this, PlayState* play) {
Actor_Kill(&this->actor);
}
} else {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 28.0f, 80.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
}
}

2
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -1237,7 +1237,7 @@ void EnBb_Update(Actor* thisx, PlayState* play2) {
this->actionFunc(this, play);
if ((this->actor.params <= ENBB_BLUE) && (this->actor.speedXZ >= -6.0f) &&
((this->actor.flags & ACTOR_FLAG_15) == 0)) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
if (this->moveMode == BBMOVE_NORMAL) {
if ((this->actor.world.pos.y - 20.0f) <= this->actor.floorHeight) {

2
src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
View file

@ -181,7 +181,7 @@ void EnBdfire_Update(Actor* thisx, PlayState* play) {
this->unk_156++;
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void EnBdfire_DrawFire(EnBdfire* this, PlayState* play) {

4
src/overlays/actors/ovl_En_Bili/z_en_bili.c
View file

@ -619,9 +619,9 @@ void EnBili_Update(Actor* thisx, PlayState* play2) {
}
}
if (this->actionFunc == EnBili_Recoil) {
Actor_MoveWithoutGravity(&this->actor);
Actor_MoveXYZ(&this->actor);
} else {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 5.0f, this->collider.dim.radius, this->collider.dim.height,

4
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -136,7 +136,7 @@ void EnBom_Move(EnBom* this, PlayState* play) {
this->actor.world.rot.y = ((this->actor.wallYaw - this->actor.world.rot.y) + this->actor.wallYaw) - 0x8000;
}
Actor_PlaySfx(&this->actor, NA_SE_EV_BOMB_BOUND);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actor.speedXZ *= 0.7f;
this->actor.bgCheckFlags &= ~BGCHECKFLAG_WALL;
}
@ -154,7 +154,7 @@ void EnBom_Move(EnBom* this, PlayState* play) {
}
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void EnBom_WaitForRelease(EnBom* this, PlayState* play) {

4
src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
View file

@ -191,7 +191,7 @@ void EnBomChu_UpdateFloorPoly(EnBomChu* this, CollisionPoly* floorPoly, PlayStat
// A hack for preventing bombchus from sticking to ledges.
// The visual rotation reverts the sign inversion (shape.rot.x = -world.rot.x).
// The better fix would be making Actor_UpdateVelocityWithoutGravity compute XYZ velocity better,
// The better fix would be making Actor_UpdateVelocityXYZ compute XYZ velocity better,
// or not using it and make the bombchu compute its own velocity.
this->actor.world.rot.x = -this->actor.world.rot.x;
}
@ -422,7 +422,7 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) {
}
this->actionFunc(this, play);
Actor_MoveWithoutGravity(&this->actor);
Actor_MoveXYZ(&this->actor);
this->collider.elements[0].dim.worldSphere.center.x = this->actor.world.pos.x;
this->collider.elements[0].dim.worldSphere.center.y = this->actor.world.pos.y;

4
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -332,7 +332,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (thisx->params == BOMBFLOWER_BODY) {
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
}
if (thisx->gravity != 0.0f) {
@ -357,7 +357,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) {
thisx->world.rot.y = ((thisx->wallYaw - thisx->world.rot.y) + thisx->wallYaw) - 0x8000;
}
Actor_PlaySfx(thisx, NA_SE_EV_BOMB_BOUND);
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
DREG(6) = 1;
Actor_UpdateBgCheckInfo(play, thisx, 5.0f, 10.0f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2 |

4
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -148,8 +148,8 @@ void EnBoom_Fly(EnBoom* this, PlayState* play) {
}
// Set xyz speed, move forward, and play the boomerang sound effect
func_8002D9A4(&this->actor, 12.0f);
Actor_MoveWithGravity(&this->actor);
Actor_SetSpeedXYZ(&this->actor, 12.0f);
Actor_MoveXZGravity(&this->actor);
func_8002F974(&this->actor, NA_SE_IT_BOOMERANG_FLY - SFX_FLAG);
// If the boomerang collides with EnItem00 or a Skulltula token, set grabbed pointer to pick it up

4
src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -8,7 +8,7 @@
/*
set on init unless treasure flag is set
if clear, chest moves (Actor_MoveWithGravity) (falls, likely)
if clear, chest moves (Actor_MoveXZGravity) (falls, likely)
ends up cleared from SWITCH_FLAG_FALL types when switch flag is set
*/
#define ENBOX_MOVE_IMMOBILE (1 << 0)
@ -521,7 +521,7 @@ void EnBox_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (!(this->movementFlags & ENBOX_MOVE_IMMOBILE)) {
Actor_MoveWithGravity(&this->dyna.actor);
Actor_MoveXZGravity(&this->dyna.actor);
Actor_UpdateBgCheckInfo(play, &this->dyna.actor, 0.0f, 0.0f, 0.0f,
UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
}

2
src/overlays/actors/ovl_En_Butte/z_en_butte.c
View file

@ -409,7 +409,7 @@ void EnButte_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->actor.update != NULL) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Math_StepToF(&this->actor.world.pos.y, this->posYTarget, 0.6f);
if (this->actor.xyzDistToPlayerSq < 5000.0f) {
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);

2
src/overlays/actors/ovl_En_Bw/z_en_bw.c
View file

@ -792,7 +792,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) {
this->unk_234 = Actor_TestFloorInDirection(thisx, play, 50.0f, thisx->world.rot.y);
if ((this->unk_220 == 4) || (this->unk_220 == 6) || (this->unk_220 == 5) || (this->unk_220 == 1) ||
(this->unk_234 != 0)) {
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
}
Actor_UpdateBgCheckInfo(play, thisx, 20.0f, 30.0f, 21.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2 |

6
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
View file

@ -236,7 +236,7 @@ void EnClearTag_Init(Actor* thisx, PlayState* play) {
this->state = CLEAR_TAG_STATE_LASER;
this->timers[CLEAR_TAG_TIMER_LASER_DEATH] = 70;
this->actor.speedXZ = 35.0f;
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
for (j = 0; j <= 0; j++) {
Actor_UpdatePos(&this->actor);
}
@ -246,7 +246,7 @@ void EnClearTag_Init(Actor* thisx, PlayState* play) {
this->actor.speedXZ = 70.0f;
this->actor.shape.rot.x = -this->actor.shape.rot.x;
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Collider_SetCylinder(play, &this->collider, &this->actor, &sLaserCylinderInit);
Actor_PlaySfx(&this->actor, NA_SE_IT_SWORD_REFLECT_MG);
} else { // Initialize the Arwing.
@ -473,7 +473,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) {
this->actor.shape.rot.x = -this->actor.shape.rot.x;
// Update the Arwing's velocity.
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
this->actor.velocity.x += this->acceleration.x;
this->actor.velocity.y += this->acceleration.y;
this->actor.velocity.z += this->acceleration.z;

2
src/overlays/actors/ovl_En_Cow/z_en_cow.c
View file

@ -301,7 +301,7 @@ void EnCow_Update(Actor* thisx, PlayState* play2) {
CollisionCheck_SetOC(play, &play->colChkCtx, &this->colliders[0].base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->colliders[1].base);
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
Actor_UpdateBgCheckInfo(play, thisx, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
if (SkelAnime_Update(&this->skelAnime)) {
if (this->skelAnime.animation == &gCowBodyChewAnim) {

4
src/overlays/actors/ovl_En_Crow/z_en_crow.c
View file

@ -440,10 +440,10 @@ void EnCrow_Update(Actor* thisx, PlayState* play) {
if (this->actionFunc != EnCrow_Respawn) {
if (this->actor.colChkInfo.health != 0) {
height = 20.0f * scale;
Actor_MoveWithoutGravity(&this->actor);
Actor_MoveXYZ(&this->actor);
} else {
height = 0.0f;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 12.0f * scale, 25.0f * scale, 50.0f * scale,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_2);

2
src/overlays/actors/ovl_En_Cs/z_en_cs.c
View file

@ -313,7 +313,7 @@ s32 EnCs_HandleWalking(EnCs* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, this->walkAngle, 1, 2500, 0);
this->actor.world.rot.y = this->actor.shape.rot.y;
this->actor.speedXZ = this->walkSpeed;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
return 0;

2
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View file

@ -542,7 +542,7 @@ void EnDaiku_EscapeRun(EnDaiku* this, PlayState* play) {
Math_SmoothStepToS(&this->actor.shape.rot.y, ry, 1, 0xFA0, 0);
this->actor.world.rot.y = this->actor.shape.rot.y;
Math_SmoothStepToF(&this->actor.speedXZ, this->runSpeed, 0.6f, dxz, 0.0f);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
if (this->subCamActive) {

2
src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
View file

@ -428,7 +428,7 @@ void EnDaikuKakariko_Run(EnDaikuKakariko* this, PlayState* play) {
Math_SmoothStepToF(&this->actor.speedXZ, this->runSpeed, 0.8f, runDist, 0.0f);
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (this->flags & 0x40) {
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);

2
src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
View file

@ -1121,7 +1121,7 @@ void EnDekubaba_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->actionFunc == EnDekubaba_PrunedSomersault) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, this->size * 15.0f, 10.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
} else if (this->actionFunc != EnDekubaba_DeadStickDrop) {

2
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
View file

@ -475,7 +475,7 @@ void EnDekunuts_Update(Actor* thisx, PlayState* play) {
if (this->actor.params != DEKUNUTS_FLOWER) {
EnDekunuts_ColliderCheck(this, play);
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -508,7 +508,7 @@ void EnDh_Update(Actor* thisx, PlayState* play) {
EnDh_CollisionCheck(this, play);
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 45.0f, 45.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View file

@ -480,7 +480,7 @@ void EnDns_Update(Actor* thisx, PlayState* play) {
Actor_SetFocus(&this->actor, 60.0f);
Actor_SetScale(&this->actor, 0.01f);
SkelAnime_Update(&this->skelAnime);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actionFunc(this, play);
if (this->standOnGround) {
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 20.0f, UPDBGCHECKINFO_FLAG_2);

2
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -417,7 +417,7 @@ void EnDntJiji_Update(Actor* thisx, PlayState* play) {
}
}
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 60.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View file

@ -804,7 +804,7 @@ void EnDntNomal_Update(Actor* thisx, PlayState* play) {
}
}
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 60.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

12
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
View file

@ -429,7 +429,7 @@ void EnDodojr_EmergeFromGround(EnDodojr* this, PlayState* play) {
}
void EnDodojr_CrawlTowardsTarget(EnDodojr* this, PlayState* play) {
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
EnDodojr_SpawnSmallDust(this, play, &this->actor.world.pos);
if (DECR(this->crawlSfxTimer) == 0) {
@ -487,7 +487,7 @@ void EnDodojr_SwallowedBombDeathBounce(EnDodojr* this, PlayState* play) {
// Scale up briefly to expand from the swallowed bomb exploding.
this->rootScale = 1.2f;
this->rootScale *= ((f32)this->actor.colorFilterTimer / 8);
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
if (EnDodojr_UpdateBounces(this, play)) {
this->timer = 60;
@ -502,7 +502,7 @@ void EnDodojr_SwallowedBombDeathSequence(EnDodojr* this, PlayState* play) {
}
void EnDodojr_StunnedBounce(EnDodojr* this, PlayState* play) {
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
if (EnDodojr_UpdateBounces(this, play)) {
EnDodojr_SetupSwallowedBombDeathSequence(this);
@ -536,7 +536,7 @@ void EnDodojr_Stunned(EnDodojr* this, PlayState* play) {
void EnDodojr_JumpAttackBounce(EnDodojr* this, PlayState* play) {
this->actor.flags |= ACTOR_FLAG_24;
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
if (EnDodojr_UpdateBounces(this, play)) {
EnDodojr_SetupCrawlTowardsTarget(this);
@ -560,7 +560,7 @@ void EnDodojr_Despawn(EnDodojr* this, PlayState* play) {
}
void EnDodojr_StandardDeathBounce(EnDodojr* this, PlayState* play) {
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
Math_SmoothStepToS(&this->actor.shape.rot.y, 0, 4, 1000, 10);
this->actor.world.rot.x = this->actor.shape.rot.x;
@ -610,7 +610,7 @@ void EnDodojr_Update(Actor* thisx, PlayState* play) {
EnDodojr* this = (EnDodojr*)thisx;
SkelAnime_Update(&this->skelAnime);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
EnDodojr_CheckDamaged(this, play);
if (this->actionFunc != EnDodojr_WaitUnderground) {

2
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
View file

@ -769,7 +769,7 @@ void EnDodongo_Update(Actor* thisx, PlayState* play) {
EnDodongo_CollisionCheck(this, play);
if (this->actor.colChkInfo.damageEffect != 0xE) {
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 75.0f, 60.0f, 70.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -455,7 +455,7 @@ void EnDog_Update(Actor* thisx, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
Actor_UpdateBgCheckInfo(play, &this->actor, this->collider.dim.radius, this->collider.dim.height * 0.5f, 0.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actionFunc(this, play);
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);

2
src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
View file

@ -84,7 +84,7 @@ void EnDyExtra_Update(Actor* thisx, PlayState* play) {
this->actor.scale.z = this->scale.z;
Actor_PlaySfx(&this->actor, NA_SE_PL_SPIRAL_HEAL_BEAM - SFX_FLAG);
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void EnDyExtra_Draw(Actor* thisx, PlayState* play) {

4
src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
View file

@ -641,9 +641,9 @@ void EnEiyer_Update(Actor* thisx, PlayState* play) {
this->actionFunc(this, play);
if (this->actor.world.rot.x == 0 || this->actionFunc == EnEiyer_Stunned) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
} else {
Actor_MoveWithoutGravity(&this->actor);
Actor_MoveXYZ(&this->actor);
}
if (this->actionFunc == EnEiyer_Glide || this->actionFunc == EnEiyer_DiveAttack ||

2
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -566,7 +566,7 @@ void func_80A03018(EnElf* this, PlayState* play) {
Math_SmoothStepToS(&this->unk_2BC, targetYaw, 10, this->unk_2AC, 0x20);
this->actor.world.rot.y = this->unk_2BC;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) {

2
src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
View file

@ -337,7 +337,7 @@ void EnExItem_ExitChest(EnExItem* this, PlayState* play) {
Actor_Kill(&this->actor);
}
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
void EnExItem_FairyMagic(EnExItem* this, PlayState* play) {

2
src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
View file

@ -369,7 +369,7 @@ void EnExRuppy_Update(Actor* thisx, PlayState* play) {
if (this->timer != 0) {
this->timer--;
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 50.0f,
UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
}

2
src/overlays/actors/ovl_En_Fd/z_en_fd.c
View file

@ -673,7 +673,7 @@ void EnFd_Update(Actor* thisx, PlayState* play) {
} else if (this->actionFunc != EnFd_WaitForCore) {
EnFd_ColliderCheck(this, play);
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
EnFd_Fade(this, play);
this->actionFunc(this, play);

4
src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
View file

@ -192,13 +192,13 @@ void EnFdFire_DanceTowardsPlayer(EnFdFire* this, PlayState* play) {
if (this->actor.speedXZ < 0.1f) {
this->actor.speedXZ = 5.0f;
}
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
}
}
void EnFdFire_Disappear(EnFdFire* this, PlayState* play) {
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.6f, 9.0f, 0.0f);
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
Math_SmoothStepToF(&this->scale, 0.0f, 0.3f, 0.1f, 0.0f);
this->actor.shape.shadowScale = 20.0f;
this->actor.shape.shadowScale *= (this->scale / 3.0f);

4
src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
View file

@ -296,7 +296,7 @@ void EnFhgFire_LightningShock(EnFhgFire* this, PlayState* play) {
EffectSsFhgFlash_SpawnShock(play, &this->actor, &pos, 200, FHGFLASH_SHOCK_NO_ACTOR);
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Collider_UpdateCylinder(&this->actor, &this->collider);
if (player->invincibilityTimer == 0) {
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base);
@ -439,7 +439,7 @@ void EnFhgFire_EnergyBall(EnFhgFire* this, PlayState* play) {
dxL = player->actor.world.pos.x - this->actor.world.pos.x;
dyL = player->actor.world.pos.y + 40.0f - this->actor.world.pos.y;
dzL = player->actor.world.pos.z - this->actor.world.pos.z;
Actor_UpdateVelocityWithoutGravity(&this->actor);
Actor_UpdateVelocityXYZ(&this->actor);
Actor_UpdatePos(&this->actor);
if (this->work[FHGFIRE_VARIANCE_TIMER] & 1) {
Actor_SetScale(&this->actor, 6.0f);

2
src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c
View file

@ -339,7 +339,7 @@ void EnFireRock_Update(Actor* thisx, PlayState* play) {
thisx->gravity = -0.3f - (this->scale * 7.0f);
}
if (this->type != FIRE_ROCK_ON_FLOOR) {
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
Actor_UpdateBgCheckInfo(play, thisx, 50.0f, 50.0f, 100.0f,
UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
}

4
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
View file

@ -683,12 +683,12 @@ void EnFirefly_Update(Actor* thisx, PlayState* play2) {
if (!(this->actor.flags & ACTOR_FLAG_15)) {
if ((this->actor.colChkInfo.health == 0) || (this->actionFunc == EnFirefly_Stunned)) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
} else {
if (this->actionFunc != EnFirefly_Rebound) {
this->actor.world.rot.x = 0x1554 - this->actor.shape.rot.x;
}
Actor_MoveWithoutGravity(&this->actor);
Actor_MoveXYZ(&this->actor);
}
}

4
src/overlays/actors/ovl_En_Fish/z_en_fish.c
View file

@ -687,7 +687,7 @@ void EnFish_OrdinaryUpdate(EnFish* this, PlayState* play) {
}
if ((this->actionFunc == NULL) || (this->actionFunc(this, play), (this->actor.update != NULL))) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (this->unk_250 != 0) {
Actor_UpdateBgCheckInfo(play, &this->actor, 17.5f, 4.0f, 0.0f, this->unk_250);
@ -726,7 +726,7 @@ void EnFish_RespawningUpdate(EnFish* this, PlayState* play) {
}
if ((this->actionFunc == NULL) || (this->actionFunc(this, play), (this->actor.update != NULL))) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (this->respawnTimer == 20) {
this->actor.draw = EnFish_Draw;

2
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
View file

@ -1045,7 +1045,7 @@ void EnFloormas_Update(Actor* thisx, PlayState* play) {
}
if (this->actionFunc != EnFloormas_GrabLink) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->actor.scale.x * 3000.0f, 0.0f,

2
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -586,7 +586,7 @@ void EnFr_UpdateActive(Actor* thisx, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
SkelAnime_Update(&this->skelAnimeButterfly);
EnFr_ButterflyPath(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
}

2
src/overlays/actors/ovl_En_Fu/z_en_fu.c
View file

@ -239,7 +239,7 @@ void EnFu_Update(Actor* thisx, PlayState* play) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);
if (!(this->behaviorFlags & FU_WAIT) && SkelAnime_Update(&this->skelanime)) {
Animation_Change(&this->skelanime, this->skelanime.animation, 1.0f, 0.0f,

2
src/overlays/actors/ovl_En_Fw/z_en_fw.c
View file

@ -363,7 +363,7 @@ void EnFw_Update(Actor* thisx, PlayState* play) {
SkelAnime_Update(&this->skelAnime);
if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_13)) {
// not attached to hookshot.
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 20.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
this->actionFunc(this, play);
if (this->damageTimer == 0 && this->explosionTimer == 0 && this->actionFunc == EnFw_Run) {

2
src/overlays/actors/ovl_En_Fz/z_en_fz.c
View file

@ -698,7 +698,7 @@ void EnFz_Update(Actor* thisx, PlayState* play) {
}
Math_StepToF(&this->actor.speedXZ, this->speedXZ, 0.2f);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (this->updateBgInfo) {
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 20.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);

4
src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
View file

@ -275,7 +275,7 @@ void EnGSwitch_GalleryRupee(EnGSwitch* this, PlayState* play) {
if (this->delayTimer == 0) {
switch (this->moveMode) {
case GSWITCH_THROW:
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if ((this->actor.velocity.y < 0.0f) && (this->actor.world.pos.y < (this->actor.home.pos.y - 50.0f))) {
gallery = ((EnSyatekiItm*)this->actor.parent);
this->actor.velocity.y = 0.0f;
@ -430,7 +430,7 @@ void EnGSwitch_Update(Actor* thisx, PlayState* play) {
}
if ((this->type != ENGSWITCH_SILVER_TRACKER) && (this->type != ENGSWITCH_SILVER_RUPEE) &&
(this->type != ENGSWITCH_TARGET_RUPEE)) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 50.0f, 50.0f, 100.0f,
UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
}

2
src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View file

@ -722,7 +722,7 @@ void EnGe1_Update(Actor* thisx, PlayState* play) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 40.0f, 25.0f, 40.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2);
this->animFunc(this);
this->actionFunc(this, play);

2
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
View file

@ -499,7 +499,7 @@ void EnGe2_MaintainColliderAndSetAnimState(EnGe2* this, PlayState* play) {
}
void EnGe2_MoveAndBlink(EnGe2* this, PlayState* play) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (DECR(this->blinkTimer) == 0) {
this->blinkTimer = Rand_S16Offset(60, 60);

2
src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
View file

@ -184,7 +184,7 @@ void EnGe3_UpdateCollision(EnGe3* this, PlayState* play) {
void EnGe3_MoveAndBlink(EnGe3* this, PlayState* play) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (DECR(this->blinkTimer) == 0) {
this->blinkTimer = Rand_S16Offset(60, 60);

2
src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View file

@ -1406,7 +1406,7 @@ void EnGeldB_Update(Actor* thisx, PlayState* play) {
EnGeldB_CollisionCheck(this, play);
if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 15.0f, 30.0f, 60.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -1032,7 +1032,7 @@ void EnGo_Update(Actor* thisx, PlayState* play) {
EnGo_UpdateShadow(this);
if (this->interactInfo.talkState == NPC_TALK_STATE_IDLE) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);

4
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1117,7 +1117,7 @@ void EnGo2_RollForward(EnGo2* this) {
}
if (this->actionFunc != EnGo2_ContinueRolling) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
}
this->actor.speedXZ = speedXZ;
@ -1933,7 +1933,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, PlayState* play) {
if (!(this->animTimer % 8)) {
Actor_PlaySfx(&this->actor, NA_SE_EN_MORIBLIN_WALK);
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
} else {
this->animTimer = 0;
this->actor.speedXZ = 0.0f;

2
src/overlays/actors/ovl_En_Goma/z_en_goma.c
View file

@ -709,7 +709,7 @@ void EnGoma_Update(Actor* thisx, PlayState* play) {
}
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
this->actor.world.pos.x = this->actor.world.pos.x + this->shieldKnockbackVel.x;
this->actor.world.pos.z = this->actor.world.pos.z + this->shieldKnockbackVel.z;
Math_ApproachZeroF(&this->shieldKnockbackVel.x, 1.0f, 3.0f);

2
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
View file

@ -300,7 +300,7 @@ s32 EnGoroiwa_MoveAndFall(EnGoroiwa* this, PlayState* play) {
Vec3s* nextPointPos;
Math_StepToF(&this->actor.speedXZ, R_EN_GOROIWA_SPEED * 0.01f, 0.3f);
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
path = &play->pathList[this->actor.params & 0xFF];
nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint;
result = true;

2
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -374,7 +374,7 @@ void func_80A4ED34(EnGs* this, PlayState* play) {
func_8002F974(&this->actor, NA_SE_EV_STONE_LAUNCH - SFX_FLAG);
}
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
if (this->actor.yDistToPlayer < -12000.0f) {
Actor_Kill(&this->actor);
}

2
src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c
View file

@ -780,7 +780,7 @@ void EnHeishi2_Update(Actor* thisx, PlayState* play) {
}
}
this->actionFunc(this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
switch (this->type) {
case 6:
break;

2
src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c
View file

@ -221,7 +221,7 @@ void EnHeishi3_Update(Actor* thisx, PlayState* play) {
}
this->actionFunc(this, play);
this->actor.shape.rot = this->actor.world.rot;
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 50.0f,
UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 | UPDBGCHECKINFO_FLAG_4);
Collider_UpdateCylinder(&this->actor, &this->collider);

2
src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
View file

@ -357,7 +357,7 @@ void EnHeishi4_Update(Actor* thisx, PlayState* play) {
}
this->unk_27E += 1;
this->actionFunc(this, play);
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
Actor_UpdateBgCheckInfo(play, thisx, 10.0f, 10.0f, 30.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
View file

@ -482,7 +482,7 @@ void EnHintnuts_Update(Actor* thisx, PlayState* play) {
EnHintnuts_ColliderCheck(this, play);
this->actionFunc(this, play);
if (this->actionFunc != EnHintnuts_Freeze && this->actionFunc != EnHintnuts_BeginFreeze) {
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

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

@ -415,7 +415,7 @@ void EnHonotrap_FlameChase(EnHonotrap* this, PlayState* play) {
Math_ScaledStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0x300);
Math_StepToF(&this->actor.speedXZ, 3.0f, 0.1f);
this->actor.gravity = (-this->actor.yDistToPlayer < 10.0f) ? 0.08f : -0.08f;
Actor_UpdateVelocityWithGravity(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
if (this->actor.velocity.y > 1.0f) {
this->actor.velocity.y = 1.0f;
}
@ -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_MoveWithGravity(&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);

2
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View file

@ -3511,7 +3511,7 @@ void EnHorse_Update(Actor* thisx, PlayState* play2) {
if (this->playerControlled == true) {
EnHorse_RegenBoost(this, play);
}
Actor_MoveWithGravity(thisx);
Actor_MoveXZGravity(thisx);
if (this->action == ENHORSE_ACT_INGO_RACE) {
if (this->rider != NULL) {
this->rider->world.pos.x = thisx->world.pos.x;

2
src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
View file

@ -287,7 +287,7 @@ void EnHorseGanon_Update(Actor* thisx, PlayState* play) {
s32 pad;
sActionFuncs[this->action](this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 55.0f, 100.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

2
src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
View file

@ -554,7 +554,7 @@ void EnHorseLinkChild_Update(Actor* thisx, PlayState* play) {
s32 pad;
sActionFuncs[this->action](this, play);
Actor_MoveWithGravity(&this->actor);
Actor_MoveXZGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 55.0f, 100.0f,
UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2 | UPDBGCHECKINFO_FLAG_3 |
UPDBGCHECKINFO_FLAG_4);

Some files were not shown because too many files have changed in this diff Show more