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

Matched func_80C0C364

Browse Source
This commit is contained in:
KiritoDv
2023-11-03 00:24:39 -06:00
parent b2e55333ad
commit be153b0d2b
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Bsb/z_en_bsb.c
+21 -1
View File
@@ -46,8 +46,10 @@ void func_80C0B290(EnBsb* this, s32 arg0);
void func_80C0B31C(PlayState* play, EnBsb* this, Vec3f* pos);
s32 func_80C0B888(EnBsb* this, PlayState* play);
void func_80C0C32C(EnBsb* this);
void func_80C0C430(EnBsb* this);
void func_80C0F544(EnBsb* this, Vec3f* pos, Vec3f* unk2, Vec3f* unk3, f32 unk4, s32 unk5);
#if 0
// static ColliderJntSphElementInit sJntSphElementsInit[7] = {
static ColliderJntSphElementInit D_80C0F8D4[7] = {
@@ -407,7 +409,25 @@ void func_80C0C32C(EnBsb* this) {
this->actionFunc = func_80C0C364;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Bsb/func_80C0C364.s")
void func_80C0C364(EnBsb* this, PlayState* play) {
f32 sp2C;
s16 sp2A;
s32 var_v1;
sp2A = this->actor.yawTowardsPlayer;
this->unk_0288 = SubS_GetPathByIndex(play, this->unk_2B6, 0x1F);
func_80C0BC30(this);
if (this->unk_0288 != NULL) {
sp2A = SubS_GetDistSqAndOrientPath(this->unk_0288, this->unk_028C, &this->actor.world.pos, &sp2C);
}
this->actor.world.rot.y -= 0x2EE;
var_v1 = ABS_ALT((s16)(this->actor.world.rot.y - sp2A));
func_80C0B970(this, play);
if (var_v1 < 0x1000) {
this->unk_2BC = this->actor.world.rot.y;
func_80C0C430(this);
}
}
void func_80C0C430(EnBsb* this) {
this->unk2A4 = 0;
src/overlays/actors/ovl_En_Bsb/z_en_bsb.h
+2 -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;