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_80C0D00C

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti
2023-11-03 05:49:28 -03:00
parent 4bd11d61a0
commit a883741195
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Bsb/z_en_bsb.c
+25 -3
View File
@@ -52,6 +52,7 @@ 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_80C0D00C(EnBsb* this);
void func_80C0F544(EnBsb* this, Vec3f* pos, Vec3f* unk2, Vec3f* unk3, f32 unk4, s32 unk5);
#if 0
@@ -690,7 +691,6 @@ void func_80C0CD90(EnBsb* this) {
this->actionFunc = func_80C0CDE4;
}
//
// https://decomp.me/scratch/vw91Q
#ifdef NON_MATCHING
void func_80C0CDE4(EnBsb* this, PlayState* play) {
@@ -724,7 +724,7 @@ void func_80C0CDE4(EnBsb* this, PlayState* play) {
) {
this->unk_F34.base.atFlags &= ~(AT_BOUNCED|AT_HIT);
EffectSsHitmark_SpawnFixedScale(play, 3, &sp34);
Actor_PlaySfx(&this->actor, 0x1806);
Actor_PlaySfx(&this->actor, NA_SE_IT_SHIELD_BOUND);
func_80C0CF4C(this);
return;
}
@@ -754,7 +754,29 @@ void func_80C0CFDC(EnBsb* this, PlayState* play) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Bsb/func_80C0D00C.s")
void func_80C0D00C(EnBsb* this) {
Vec3f vec;
this->unk2A4 = 0;
this->actor.speed = 0.0f;
if (this->actor.world.pos.z < -1300.0f) {
Matrix_RotateYS(((s32)Rand_CenteredFloat(16384.0f) + this->actor.yawTowardsPlayer), MTXMODE_NEW);
Matrix_MultVecZ(-30.0f, &vec);
} else {
Matrix_RotateYS(this->actor.yawTowardsPlayer, MTXMODE_NEW);
Matrix_MultVecZ(-50.0f, &vec);
vec.z = 0.0f;
}
Math_Vec3f_Copy(&this->unk_0298, &vec);
Actor_PlaySfx(&this->actor, NA_SE_EN_KITA_DAMAGE);
func_80C0B290(this, 7);
this->unk2AE = 1;
this->unk2B4 = 8;
this->actionFunc = func_80C0D10C;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Bsb/func_80C0D10C.s")
src/overlays/actors/ovl_En_Bsb/z_en_bsb.h
+2 -1
View File
@@ -18,7 +18,8 @@ typedef struct EnBsb {
/* 0x0290 */ u8 unk_0290;
/* 0x0291 */ char pad_0291[0x3];
/* 0x0294 */ s16 unk294;
/* 0x0296 */ char unk_296[0xE];
/* 0x0296 */ s16 unk_0296;
/* 0x0298 */ Vec3f unk_0298;
/* 0x02A4 */ s32 unk2A4;
/* 0x02A8 */ s32 unk2A8;
/* 0x02AC */ char unk_2AC[0x2];