izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

func_80C0C484

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti
2023-11-03 03:32:25 -03:00
parent 3fa2479638
commit f475a6b6e4
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Bsb/z_en_bsb.c
+49 -2
View File
@@ -419,7 +419,54 @@ void func_80C0C430(EnBsb* this) {
this->actionFunc = func_80C0C484;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Bsb/func_80C0C484.s")
void func_80C0C484(EnBsb* this, PlayState* play) {
f32 sp34;
s16 var_a1;
s16 temp_v1;
func_80C0BC30(this);
if (func_80C0B888(this, play) != 0) {
this->actor.flags &= 0xFDFFFFFF;
func_80C0C86C(this);
return;
}
var_a1 = this->actor.yawTowardsPlayer;
if (this->unk294 == 1) {
this->actor.flags &= 0xFDFFFFFF;
}
if (this->unk_0288 != NULL) {
var_a1 = SubS_GetDistSqAndOrientPath(this->unk_0288, this->unk_028C, &this->actor.world.pos, &sp34);
}
Math_SmoothStepToS(&this->actor.world.rot.y, var_a1, 2, 0x2EE, 5);
temp_v1 = ABS_ALT((s16)(this->actor.world.rot.y - var_a1));
if (temp_v1 < 0x1000) {
this->unk_2BC = this->actor.world.rot.y;
this->actor.speed = 3.5f;
if (this->unk_2AF == 0) {
this->unk_2AF = 1;
Audio_PlayBgm_StorePrevBgm(3);
}
}
func_80C0B970(this, play);
if (sp34 < 25.0f) {
if (this->unk_0288 != NULL) {
this->unk_028C = this->unk_028C + 1;
if (this->unk_028C >= this->unk_0288->count) {
this->unk_028C = this->unk_028C - 1;
func_80C0DA58(this);
}
}
}
}
void func_80C0C610(EnBsb* this) {
this->unk2A4 = 0;
@@ -430,7 +477,7 @@ void func_80C0C610(EnBsb* this) {
if (this->unk2DC != 0) {
this->unk294 = 0x28;
Actor_PlaySfx(&this->actor, NA_SE_EN_COMMON_FREEZE);
Actor_SetColorFilter(&this->actor, 0U, 0xFFU, 0U, 0x28);
Actor_SetColorFilter(&this->actor, 0U, 0xFF, 0U, 0x28);
}
this->unk2B4 = 3;
this->actionFunc = func_80C0C6A8;
src/overlays/actors/ovl_En_Bsb/z_en_bsb.h
+3 -1
View File
@@ -13,7 +13,8 @@ typedef struct EnBsb {
/* 0x0188 */ Vec3s unk_188[21];
/* 0x0188 */ Vec3s unk_206[21];
/* 0x0284 */ EnBsbActionFunc actionFunc;
/* 0x0288 */ char unk_288[0x8];
/* 0x0288 */ Path* unk_0288;
/* 0x028C */ s32 unk_028C;
/* 0x0290 */ u8 unk_0290;
/* 0x0291 */ char pad_0291[0x3];
/* 0x0294 */ s16 unk294;
@@ -22,6 +23,7 @@ typedef struct EnBsb {
/* 0x02A8 */ s32 unk2A8;
/* 0x02AC */ char unk_2AC[0x2];
/* 0x02AE */ u8 unk2AE;
/* 0x02AF */ u8 unk_2AF;
/* 0x02B0 */ s32 unk2B0;
/* 0x02B4 */ s16 unk2B4;
/* 0x02B6 */ s16 unk_2B6;