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_8086F2FC

Browse Source
This commit is contained in:
inspectredc
2023-11-01 23:43:00 +00:00
parent 743ebd4231
commit f97f633eb9
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+21 -1
View File
@@ -504,7 +504,27 @@ void func_8086EFE8(EnOkuta* this, PlayState* play) {
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Okuta/func_8086F2FC.s")
void func_8086F2FC(EnOkuta* this, PlayState* play) {
this->unk18E = 0xA;
Actor_SetColorFilter(&this->actor, 0x8000, 0x80FF, 0, 0xA);
this->actor.child = Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, 0x143, this->actor.world.pos.x, this->actor.world.pos.y + (this->skelAnime.jointTable->y * this->actor.scale.y) + (25.0f * this->unk268), this->actor.world.pos.z, 0, this->actor.home.rot.y, 0, 3);
if (this->actor.child != NULL) {
this->actor.flags &= ~1;
this->actor.flags |= 0x10;
this->actor.child->csId = this->actor.csId;
this->actionFunc = func_8086F434;
return;
}
func_8086E084(this);
if (!Actor_ApplyDamage(&this->actor)) {
Enemy_StartFinishingBlow(play, &this->actor);
this->collider.base.acFlags &= 0xFFFE;
this->unk18E = 3;
}
this->actionFunc = func_8086F4B0;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Okuta/func_8086F434.s")
src/overlays/actors/ovl_En_Okuta/z_en_okuta.h
+3 -1
View File
@@ -22,7 +22,9 @@ typedef struct EnOkuta {
/* 0x258 */ f32 unk258;
/* 0x25C */ f32 unk25C;
/* 0x260 */ f32 unk260;
/* 0x268 */ char pad268[0xC];
/* 0x264 */ char pad264[0x4];
/* 0x268 */ f32 unk268;
/* 0x26C */ char pad26C[0x4];
/* 0x270 */ Vec3f bodyPartsPos[0xA];
/* 0x2E8 */ ColliderCylinder collider;
} EnOkuta;