mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

speedXZ -> speed (#1477)

Browse source 
* speedXZ -> speed

* +=

* revert arg in player function

* anon review

* engineer review

* forgot one

* last review

* revert decimal
This commit is contained in:
fig02 2022-12-24 12:18:57 -05:00 • committed by GitHub
parent 4a9873775c
commit 92e03cf747
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
171 changed files with 1771 additions and 1773 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -423,7 +423,7 @@ void BossGanon_Init(Actor* thisx, PlayState* play2) {
thisx->update = func_808E1EB4;
thisx->draw = func_808E229C;
if (1) {}
thisx->speedXZ = 11.0f;
thisx->speed = 11.0f;
if (thisx->params == 0xC8) {
this->timers[0] = 7;
@ -439,7 +439,7 @@ void BossGanon_Init(Actor* thisx, PlayState* play2) {
// light ball (anything from 0x64 - 0xC7)
thisx->update = BossGanon_LightBall_Update;
thisx->draw = BossGanon_LightBall_Draw;
thisx->speedXZ = 12.0f;
thisx->speed = 12.0f;
xDistFromPlayer = player->actor.world.pos.x - thisx->world.pos.x;
yDistFromPlayer = (player->actor.world.pos.y + 30.0f) - thisx->world.pos.y;
@ -3969,7 +3969,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) {
}
if (player->meleeWeaponAnimation >= PLAYER_MWA_SPIN_ATTACK_1H) {
this->actor.speedXZ = 20.0f;
this->actor.speed = 20.0f;
}
break;
} else {
@ -4000,7 +4000,7 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) {
case 1:
if ((ganondorf->actionFunc == BossGanon_PlayTennis) && (ganondorf->unk_1C2 == 1)) {
minReflectDist = (this->actor.speedXZ >= 19.0f) ? 250.0f : 170.0f;
minReflectDist = (this->actor.speed >= 19.0f) ? 250.0f : 170.0f;
if (sqrtf(SQ(xDistFromGanondorf) + SQ(yDistFromGanondorf) + SQ(zDistFromGanondorf)) <
minReflectDist) {
@ -4226,7 +4226,7 @@ void func_808E1EB4(Actor* thisx, PlayState* play2) {
if (sqrtf(SQ(xDiff) + SQ(zDiff) + SQ(yDiff)) < 40.0f) {
this->unk_1C2 = 2;
this->timers[0] = 30;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
if (this->actor.params == 0xC8) {
func_80078884(NA_SE_EN_GANON_DAMAGE2);
@ -4338,7 +4338,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
switch (this->unk_1C2) {
if (1) {}
case 0:
this->actor.speedXZ = 40.0f;
this->actor.speed = 40.0f;
Math_ApproachF(&this->fwork[1], 255.0f, 1.0f, 40.0f);
xDiff = dorf->unk_278.x - this->actor.world.pos.x;
yDiff = dorf->unk_278.y - this->actor.world.pos.y;
@ -4360,7 +4360,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
if (sqrtf(SQ(xDiff) + SQ(zDiff) + SQ(yDiff)) < 45.0f) {
this->unk_1C2 = 1;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
}
break;
@ -4380,7 +4380,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
this->collider.dim.height = 20;
this->collider.dim.yShift = -10;
this->actor.speedXZ = 20.0f;
this->actor.speed = 20.0f;
this->fwork[1] = 255.0f;
this->unk_1F0 = player->actor.world.pos;
new_var = this->unk_1F0.x - this->actor.world.pos.x;
@ -4411,7 +4411,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
if ((player->meleeWeaponState != 0) && (player->meleeWeaponAnimation >= PLAYER_MWA_SPIN_ATTACK_1H) &&
(this->actor.xzDistToPlayer < 80.0f)) {
this->unk_1C2 = 0xC;
this->actor.speedXZ = -30.0f;
this->actor.speed = -30.0f;
func_8002D908(&this->actor);
func_8002D7EC(&this->actor);
this->unk_1F0 = dorf->unk_1FC;
@ -4427,7 +4427,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
if (!(acHitInfo->toucher.dmgFlags & DMG_SHIELD) || Player_HasMirrorShieldEquipped(play)) {
Rumble_Request(this->actor.xyzDistToPlayerSq, 180, 20, 100);
this->unk_1C2 = 0xC;
this->actor.speedXZ = -30.0f;
this->actor.speed = -30.0f;
func_8002D908(&this->actor);
func_8002D7EC(&this->actor);
@ -4457,7 +4457,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
if (sqrtf(SQ(xDiff) + SQ(zDiff) + SQ(yDiff)) < 30.0f) {
this->unk_1C2 = 1;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
if (dorf->timers[2] == 0) {
func_8002F6D4(play, &this->actor, 3.0f, this->actor.world.rot.y, 0.0f, 0x50);
@ -4477,7 +4477,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
break;
case 12:
this->actor.speedXZ = 20.0f;
this->actor.speed = 20.0f;
xDiff = this->unk_1F0.x - this->actor.world.pos.x;
yDiff = this->unk_1F0.y - this->actor.world.pos.y;
@ -4508,7 +4508,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
this->timers[0] = 150;
numEffects = 40;
this->unk_1C2 = 1;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
}
break;
}
@ -4520,7 +4520,7 @@ void func_808E2544(Actor* thisx, PlayState* play) {
(fabsf(this->actor.world.pos.z) > (465.0f + xzDist)) || (this->actor.world.pos.y < 0.0f) ||
(this->actor.world.pos.y > 450.0f)) {
this->unk_1C2 = 1;
this->actor.speedXZ = 0.0f;
this->actor.speed = 0.0f;
numEffects = 10;
BossGanon_CheckFallingPlatforms(this, play, &this->actor.world.pos);
Actor_SpawnAsChild(&play->actorCtx, &dorf->actor, play, ACTOR_BOSS_GANON, this->actor.world.pos.x,