falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consolidate array | z_en_fish2 (#1627) 

* Consolidate array

* Format
This commit is contained in:
louist103 2024-05-12 13:46:28 -04:00 committed by GitHub
parent 8e5b376b8d
commit ef6323b9cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/overlays/actors/ovl_En_Fish2/z_en_fish2.c
View File

@ -98,8 +98,7 @@ static ColliderJntSphInit sJntSphInit = {
sJntSphElementsInit,
};
static f32 D_80B2B370[] = { 0.01f, 0.012f, 0.014f, 0.017f };
static f32 D_80B2B380[] = { 0.019f, 0.033f };
static f32 D_80B2B370[] = { 0.01f, 0.012f, 0.014f, 0.017f, 0.019f, 0.033f };
typedef enum {
/* 0 */ FISH2_ANIM_0,
@ -256,7 +255,7 @@ void func_80B287F4(EnFish2* this, s32 arg1) {
if (!arg1) {
this->unk_338 = 410.0f - this->unk_2C4;
}
Math_ApproachF(&this->unk_350->speed, (D_80B2B380[0] - this->unk_330) * this->unk_338, 0.1f, 0.4f);
Math_ApproachF(&this->unk_350->speed, (D_80B2B370[4] - this->unk_330) * this->unk_338, 0.1f, 0.4f);
}
Math_Vec3f_Copy(&sp2C, &this->unk_350->world.pos);
this->unk_34A = Math_Vec3f_Yaw(&this->actor.world.pos, &sp2C);
@ -398,7 +397,7 @@ void func_80B28C14(EnFish2* this, PlayState* play) {
}
if (this->unk_2B4 == 0) {
Math_ApproachF(&this->actor.speed, (D_80B2B380[0] - this->unk_330) * 400.0f, 0.3f, 0.3f);
Math_ApproachF(&this->actor.speed, (D_80B2B370[4] - this->unk_330) * 400.0f, 0.3f, 0.3f);
if (this->actor.speed > 3.0f) {
this->actor.speed = 3.0f;
} else if (this->actor.speed < 1.5f) {
@ -484,7 +483,7 @@ void func_80B29194(EnFish2* this) {
void func_80B29250(EnFish2* this, PlayState* play) {
if (!func_80B28478(this)) {
Math_ApproachF(&this->actor.speed, (D_80B2B380[0] - this->unk_330) * 1000.0f, 0.3f, 0.3f);
Math_ApproachF(&this->actor.speed, (D_80B2B370[4] - this->unk_330) * 1000.0f, 0.3f, 0.3f);
if (this->actor.speed > 4.0f) {
this->actor.speed = 4.0f;
@ -513,7 +512,7 @@ void func_80B293C4(EnFish2* this, PlayState* play) {
if (!func_80B28478(this)) {
func_80B287F4(this, true);
Math_ApproachF(&this->actor.speed, (*D_80B2B380 - this->unk_330) * 1000.0f, 0.3f, 0.3f);
Math_ApproachF(&this->actor.speed, (D_80B2B370[4] - this->unk_330) * 1000.0f, 0.3f, 0.3f);
if (this->actor.speed > 3.0f) {
this->actor.speed = 3.0f;
@ -792,7 +791,7 @@ void func_80B29EE4(EnFish2* this, PlayState* play) {
}
this->unk_338 = 410.0f - this->unk_2C4;
Math_ApproachF(&this->actor.speed, 2.0f, 0.3f, 0.3f);
Math_ApproachF(&this->unk_350->speed, (D_80B2B380[0] - this->unk_330) * this->unk_338, 0.1f, 0.4f);
Math_ApproachF(&this->unk_350->speed, (D_80B2B370[4] - this->unk_330) * this->unk_338, 0.1f, 0.4f);
func_80B289DC(this, play);
Math_Vec3f_Copy(&sp2C, &this->unk_350->world.pos);
this->unk_34A = Math_Vec3f_Yaw(&this->actor.world.pos, &sp2C);