En_Syateki_Crow (Shooting Gallery Guay) OK (#694)

* EnSyatekiCrow_Init OK * EnSyatekiCrow_Destroy OK * func_809CA5D4 * func_809CA67C OK * func_809CA71C OK * func_809CA840 OK * func_809CA8E4 OK * EnSyatekiCrow_Update OK * func_809CAAF8 OK * func_809CABC0 OK * func_809CACD0 OK * EnSyatekiCrow_Draw OK * func_809CAE5C OK * func_809CAF2C OK * Migrate data to C * Object symbols * Use generated reloc * Name static variables * Name LimbDraw functions * Remove struct padding * Respond to review * Respond to Elliptic's review
2022-03-05 06:03:59 -08:00 · 2022-03-05 06:03:59 -08:00 · f4a9d117b1
parent 5f9e906727
commit f4a9d117b1
5 changed files with 289 additions and 42 deletions
--- a/3
+++ b/3
@ -2453,8 +2453,7 @@ beginseg
    name "ovl_En_Syateki_Crow"
    compress
    include "build/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.o"
-    include "build/data/ovl_En_Syateki_Crow/ovl_En_Syateki_Crow.data.o"
-    include "build/data/ovl_En_Syateki_Crow/ovl_En_Syateki_Crow.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Syateki_Crow/ovl_En_Syateki_Crow_reloc.o"
 endseg

 beginseg
--- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c
+++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c
@ -5,6 +5,8 @@
 */

 #include "z_en_syateki_crow.h"
+#include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h"
+#include "objects/object_crow/object_crow.h"

 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_8000000)

@ -15,7 +17,15 @@ void EnSyatekiCrow_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnSyatekiCrow_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnSyatekiCrow_Draw(Actor* thisx, GlobalContext* globalCtx);

-#if 0
+void func_809CA5D4(EnSyatekiCrow* this);
+void func_809CA67C(EnSyatekiCrow* this, GlobalContext* globalCtx);
+void func_809CA71C(EnSyatekiCrow* this);
+void func_809CA840(EnSyatekiCrow* this, GlobalContext* globalCtx);
+void func_809CA8E4(EnSyatekiCrow* this, GlobalContext* globalCtx);
+void func_809CABC0(EnSyatekiCrow* this, GlobalContext* globalCtx);
+
+static Vec3f D_809CB050 = { 0.0f, 0.0f, 0.0f };
+
 const ActorInit En_Syateki_Crow_InitVars = {
    ACTOR_EN_SYATEKI_CROW,
    ACTORCAT_ENEMY,
@ -28,60 +38,287 @@ const ActorInit En_Syateki_Crow_InitVars = {
    (ActorFunc)EnSyatekiCrow_Draw,
 };

-// static ColliderJntSphElementInit sJntSphElementsInit[1] = {
-static ColliderJntSphElementInit D_809CB07C[1] = {
+static ColliderJntSphElementInit sJntSphElementsInit[1] = {
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_ON,
+        },
        { 1, { { 0, 60, 0 }, 50 }, 100 },
    },
 };

-// static ColliderJntSphInit sJntSphInit = {
-static ColliderJntSphInit D_809CB0A0 = {
-    { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_JNTSPH, },
-    1, D_809CB07C, // sJntSphElementsInit,
+static ColliderJntSphInit sJntSphInit = {
+    {
+        COLTYPE_HIT3,
+        AT_ON | AT_TYPE_ENEMY,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_ON | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_JNTSPH,
+    },
+    1,
+    sJntSphElementsInit,
 };

-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_809CB0B0[] = {
+static InitChainEntry sInitChain[] = {
    ICHAIN_F32(uncullZoneScale, 3000, ICHAIN_CONTINUE),
    ICHAIN_S8(hintId, 88, ICHAIN_CONTINUE),
    ICHAIN_F32_DIV1000(gravity, -500, ICHAIN_CONTINUE),
    ICHAIN_F32(targetArrowOffset, 2000, ICHAIN_STOP),
 };

-#endif
+static Vec3f D_809CB0C0 = { 0.0f, 20.0f, 0.0f };

-extern ColliderJntSphElementInit D_809CB07C[1];
-extern ColliderJntSphInit D_809CB0A0;
-extern InitChainEntry D_809CB0B0[];
+static Vec3f D_809CB0CC = { 0.0f, 0.0f, 0.0f };

-extern UNK_TYPE D_060000F0;
+static Vec3f D_809CB0D8 = { 2500.0f, 0.0f, 0.0f };

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/EnSyatekiCrow_Init.s")
+void EnSyatekiCrow_Init(Actor* thisx, GlobalContext* globalCtx2) {
+    GlobalContext* globalCtx = globalCtx2;
+    EnSyatekiCrow* this = THIS;
+    Path* path;
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;
+    s32 temp;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/EnSyatekiCrow_Destroy.s")
+    path = syatekiMan->path;
+    while (path->unk2 != 0) {
+        path = &globalCtx->setupPathList[path->unk1];
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CA5D4.s")
+    temp = 0;
+    while (temp < EN_SYATEKI_CROW_GET_PARAM_FF00(&this->actor)) {
+        temp++;
+        path = &globalCtx->setupPathList[path->unk1];
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CA67C.s")
+    Actor_ProcessInitChain(&this->actor, sInitChain);
+    SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_crow_Skel_0010C0, &object_crow_Anim_0000F0,
+                       this->jointTable, this->morphTable, 9);
+    Collider_InitJntSph(globalCtx, &this->unk_23C);
+    Collider_SetJntSph(globalCtx, &this->unk_23C, &this->actor, &sJntSphInit, &this->unk_25C);
+    this->unk_23C.elements->dim.worldSphere.radius = sJntSphInit.elements[0].dim.modelSphere.radius;
+    ActorShape_Init(&this->actor.shape, 2000.0f, ActorShadow_DrawCircle, 20.0f);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CA71C.s")
+    if ((path == NULL) || (EN_SYATEKI_CROW_GET_PARAM_FF00(&this->actor) >= 0x80)) {
+        Actor_MarkForDeath(&this->actor);
+        return;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CA840.s")
+    this->unk_1C8 = Lib_SegmentedToVirtual(path->points);
+    this->unk_1CC = 1;
+    this->unk_1CE = path->count;
+    this->unk_1C4 = 0x14;
+    this->unk_1BC = 0;
+    func_809CA5D4(this);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CA8E4.s")
+void EnSyatekiCrow_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnSyatekiCrow* this = THIS;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CAAF8.s")
+    Collider_DestroyJntSph(globalCtx, &this->unk_23C);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CABC0.s")
+void func_809CA5D4(EnSyatekiCrow* this) {
+    Actor_SetScale(&this->actor, 0.03f);
+    this->actor.speedXZ = 0.0f;
+    this->actor.gravity = 0.0f;
+    this->actor.world = this->actor.home;
+    this->actor.prevPos = this->actor.home.pos;
+    this->actor.shape.rot = this->actor.world.rot;
+    this->unk_1CC = 1;
+    this->actor.draw = NULL;
+    this->actionFunc = func_809CA67C;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CACD0.s")
+void func_809CA67C(EnSyatekiCrow* this, GlobalContext* globalCtx) {
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/EnSyatekiCrow_Update.s")
+    if ((syatekiMan->unk_26A == 1) && (this->unk_1C2 == 1) &&
+        (syatekiMan->unk_274 & (1 << EN_SYATEKI_CROW_GET_PARAM_FF00(&this->actor)))) {
+        func_809CA71C(this);
+    } else if (syatekiMan->unk_26A != 1) {
+        this->unk_1C2 = 1;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CAE5C.s")
+    if ((syatekiMan->unk_274 == 0) && (syatekiMan->unk_274 == 0)) {
+        this->unk_1C2 = 1;
+    }
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/func_809CAF2C.s")
+void func_809CA71C(EnSyatekiCrow* this) {
+    Vec3f sp24;
+    s16 temp;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Crow/EnSyatekiCrow_Draw.s")
+    this->actor.world.pos.x = this->unk_1C8[0].x;
+    this->actor.world.pos.y = this->unk_1C8[0].y;
+    this->actor.world.pos.z = this->unk_1C8[0].z;
+    sp24.x = this->unk_1C8[this->unk_1CC].x;
+    sp24.y = this->unk_1C8[this->unk_1CC].y;
+    sp24.z = this->unk_1C8[this->unk_1CC].z;
+    temp = Math_Vec3f_Yaw(&this->actor.world.pos, &sp24);
+    this->actor.world.rot.y = temp;
+    this->actor.shape.rot.y = temp;
+    temp = Math_Vec3f_Pitch(&this->actor.world.pos, &sp24);
+    this->actor.shape.rot.x = temp;
+    this->actor.world.rot.x = temp;
+    this->actor.draw = EnSyatekiCrow_Draw;
+    this->actionFunc = func_809CA840;
+}
+
+void func_809CA840(EnSyatekiCrow* this, GlobalContext* globalCtx) {
+    if (((EN_SYATEKI_CROW_GET_PARAM_F(&this->actor) * 20) + 20) < this->unk_1BC) {
+        Actor_PlaySfxAtPos(this->actor.parent, NA_SE_EN_KAICHO_CRY);
+        this->unk_1BC = 0;
+        this->actor.speedXZ = EN_SYATEKI_CROW_GET_PARAM_F0(&this->actor) + 6.0f;
+        this->actor.gravity = -0.5f;
+        this->actionFunc = func_809CA8E4;
+    } else {
+        this->unk_1BC++;
+    }
+}
+
+void func_809CA8E4(EnSyatekiCrow* this, GlobalContext* globalCtx) {
+    Vec3f sp34;
+    f32 sp30;
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;
+
+    if (syatekiMan->unk_26A != 1) {
+        func_809CA5D4(this);
+        return;
+    }
+
+    sp34.x = this->unk_1C8[this->unk_1CC].x;
+    sp34.y = this->unk_1C8[this->unk_1CC].y;
+    sp34.z = this->unk_1C8[this->unk_1CC].z;
+
+    sp30 = Math_Vec3f_DistXZ(&this->actor.world.pos, &sp34);
+    this->unk_1C0 = Math_Vec3f_Yaw(&this->actor.world.pos, &sp34);
+    this->unk_1BE = Math_Vec3f_Pitch(&this->actor.world.pos, &sp34);
+
+    if (sp30 > 100.0f) {
+        Math_SmoothStepToS(&this->actor.world.rot.y, this->unk_1C0, 5, 0x3000, 0x100);
+        this->actor.shape.rot.y = this->actor.world.rot.y;
+        Math_SmoothStepToS(&this->actor.shape.rot.x, this->unk_1BE, 5, 0x3000, 0x100);
+        this->actor.world.rot.x = -this->actor.shape.rot.x;
+    } else if (this->unk_1CC < (this->unk_1CE - 1)) {
+        this->unk_1CC++;
+    } else {
+        this->unk_1C2 = 0;
+        syatekiMan->unk_274 &= ~(1 << EN_SYATEKI_CROW_GET_PARAM_FF00(&this->actor));
+        func_809CA5D4(this);
+    }
+
+    SkelAnime_Update(&this->skelAnime);
+    this->actor.shape.yOffset = (fabsf(this->skelAnime.curFrame - 3.0f) * 150.0f) + 1700.0f;
+    if ((syatekiMan->unk_26C % 90) == 0) {
+        Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_CRY);
+    }
+}
+
+void func_809CAAF8(EnSyatekiCrow* this) {
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;
+
+    syatekiMan->unk_280 += 60;
+    this->unk_1C2 = 0;
+    this->actor.speedXZ *= Math_CosS(this->actor.world.rot.x);
+    this->actor.velocity.y = 0.0f;
+    Animation_Change(&this->skelAnime, &object_crow_Anim_0000F0, 0.4f, 0.0f, 0.0f, 1, -3.0f);
+    this->actor.bgCheckFlags &= ~1;
+    Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KAICHO_DEAD);
+    Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 40);
+    this->actionFunc = func_809CABC0;
+}
+
+void func_809CABC0(EnSyatekiCrow* this, GlobalContext* globalCtx) {
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;
+
+    Math_StepToF(&this->actor.speedXZ, 0.0f, 0.5f);
+    this->actor.colorFilterTimer = 40;
+
+    if (this->actor.colorFilterParams & 0x4000) {
+        Math_ScaledStepToS(&this->actor.shape.rot.x, 0x4000, 0x200);
+        this->actor.shape.rot.z += 0x1780;
+    }
+
+    if (this->unk_1C4 > 20) {
+        func_800B3030(globalCtx, &this->actor.world.pos, &D_809CB050, &D_809CB050, this->actor.scale.x * 10000.0f, 0,
+                      0);
+        syatekiMan->unk_27A++;
+        syatekiMan->unk_274 &= ~(1 << EN_SYATEKI_CROW_GET_PARAM_FF00(&this->actor));
+        func_809CA5D4(this);
+    }
+
+    this->unk_1C4++;
+}
+
+void func_809CACD0(EnSyatekiCrow* this, GlobalContext* globalCtx) {
+    if (this->actionFunc == func_809CA8E4) {
+        if (this->unk_23C.base.acFlags & AC_HIT) {
+            play_sound(NA_SE_SY_TRE_BOX_APPEAR);
+            this->unk_1C4 = 0;
+            this->unk_23C.base.acFlags &= ~AC_HIT;
+            EffectSsExtra_Spawn(globalCtx, &this->actor.world.pos, &D_809CB0C0, &D_809CB0CC, 5, 1);
+            func_809CAAF8(this);
+        } else {
+            this->unk_23C.elements->dim.worldSphere.center.x = this->actor.world.pos.x;
+            this->unk_23C.elements->dim.worldSphere.center.y =
+                sJntSphInit.elements[0].dim.modelSphere.center.y + this->actor.world.pos.y;
+            this->unk_23C.elements->dim.worldSphere.center.z = this->actor.world.pos.z;
+            CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->unk_23C.base);
+        }
+    }
+}
+
+void EnSyatekiCrow_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnSyatekiCrow* this = THIS;
+
+    this->actionFunc(this, globalCtx);
+
+    if (this->actionFunc != func_809CABC0) {
+        Actor_MoveWithoutGravity(&this->actor);
+    } else {
+        Actor_MoveWithGravity(&this->actor);
+    }
+
+    func_809CACD0(this, globalCtx);
+}
+
+s32 EnSyatekiCrow_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                   Actor* thisx) {
+    EnSyatekiCrow* this = THIS;
+
+    if (limbIndex == 7) {
+        rot->y += (s16)(3072.0f * sin_rad(this->skelAnime.curFrame * 0.7853982f));
+    } else if (limbIndex == 8) {
+        rot->y += (s16)(5120.0f * sin_rad((this->skelAnime.curFrame + 2.5f) * 0.7853982f));
+    }
+
+    return false;
+}
+
+void EnSyatekiCrow_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
+    EnSyatekiCrow* this = THIS;
+    Vec3f* sp1C;
+
+    if (limbIndex == 2) {
+        Matrix_MultiplyVector3fByState(&D_809CB0D8, &this->unk_144[0]);
+        this->unk_144[0].y -= 20.0f;
+    } else if ((limbIndex == 4) || (limbIndex == 6) || (limbIndex == 8)) {
+        sp1C = &this->unk_144[(limbIndex >> 1) - 1];
+        Matrix_MultiplyVector3fByState(&D_809CB050, sp1C);
+        sp1C->y -= 20.0f;
+    }
+}
+
+void EnSyatekiCrow_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    EnSyatekiCrow* this = THIS;
+
+    func_8012C28C(globalCtx->state.gfxCtx);
+    SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
+                          EnSyatekiCrow_OverrideLimbDraw, EnSyatekiCrow_PostLimbDraw, &this->actor);
+}
--- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h
+++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.h
@ -3,15 +3,31 @@

 #include "global.h"

+#define EN_SYATEKI_CROW_GET_PARAM_F(thisx) ((thisx)->params & 0xF)
+#define EN_SYATEKI_CROW_GET_PARAM_F0(thisx) (((thisx)->params & 0xF0) >> 4)
+#define EN_SYATEKI_CROW_GET_PARAM_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
+
 struct EnSyatekiCrow;

 typedef void (*EnSyatekiCrowActionFunc)(struct EnSyatekiCrow*, GlobalContext*);

 typedef struct EnSyatekiCrow {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x74];
-    /* 0x01B8 */ EnSyatekiCrowActionFunc actionFunc;
-    /* 0x01BC */ char unk_1BC[0xE0];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ Vec3f unk_144[4];
+    /* 0x174 */ SkelAnime skelAnime;
+    /* 0x1B8 */ EnSyatekiCrowActionFunc actionFunc;
+    /* 0x1BC */ s16 unk_1BC;
+    /* 0x1BE */ s16 unk_1BE;
+    /* 0x1C0 */ s16 unk_1C0;
+    /* 0x1C2 */ s16 unk_1C2;
+    /* 0x1C4 */ s16 unk_1C4;
+    /* 0x1C8 */ Vec3s* unk_1C8;
+    /* 0x1CC */ s16 unk_1CC;
+    /* 0x1CE */ s16 unk_1CE;
+    /* 0x1D0 */ Vec3s jointTable[9];
+    /* 0x206 */ Vec3s morphTable[9];
+    /* 0x23C */ ColliderJntSph unk_23C;
+    /* 0x25C */ ColliderJntSphElement unk_25C;
 } EnSyatekiCrow; // size = 0x29C

 extern const ActorInit En_Syateki_Crow_InitVars;
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@ -9134,8 +9134,8 @@
    0x809CABC0:("func_809CABC0",),
    0x809CACD0:("func_809CACD0",),
    0x809CADE8:("EnSyatekiCrow_Update",),
-    0x809CAE5C:("func_809CAE5C",),
-    0x809CAF2C:("func_809CAF2C",),
+    0x809CAE5C:("EnSyatekiCrow_OverrideLimbDraw",),
+    0x809CAF2C:("EnSyatekiCrow_PostLimbDraw",),
    0x809CAFEC:("EnSyatekiCrow_Draw",),
    0x809CB200:("EnBoj04_Init",),
    0x809CB210:("EnBoj04_Destroy",),
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@ -1790,11 +1790,6 @@ D_0600D640 = 0x0600D640;
 D_06006C18 = 0x06006C18;
 D_0600D640 = 0x0600D640;

-// ovl_En_Syateki_Crow
-
-D_060000F0 = 0x060000F0;
-D_060010C0 = 0x060010C0;
-
 // ovl_En_Syateki_Dekunuts

 D_06001E50 = 0x06001E50;