Bg_Spdweb (1 non-matching) (#685)

* Bg_Spdweb * PR
2022-03-25 02:30:02 +00:00 · 2022-03-25 02:30:02 +00:00 · ecb4afd822
parent 9a54ec9e0b
commit ecb4afd822
4 changed files with 468 additions and 52 deletions
--- a/5
+++ b/5
@ -2470,8 +2470,11 @@ beginseg
    name "ovl_Bg_Spdweb"
    compress
    include "build/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.o"
-    include "build/data/ovl_Bg_Spdweb/ovl_Bg_Spdweb.data.o"
+#ifdef NON_MATCHING
+    include "build/src/overlays/actors/ovl_Bg_Spdweb/ovl_Bg_Spdweb_reloc.o"
+#else
    include "build/data/ovl_Bg_Spdweb/ovl_Bg_Spdweb.reloc.o"
+#endif
 endseg

 beginseg
--- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
+++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c
@ -5,6 +5,7 @@
 */

 #include "z_bg_spdweb.h"
+#include "objects/object_spdweb/object_spdweb.h"

 #define FLAGS 0x00000000

@ -15,7 +16,14 @@ void BgSpdweb_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void BgSpdweb_Update(Actor* thisx, GlobalContext* globalCtx);
 void BgSpdweb_Draw(Actor* thisx, GlobalContext* globalCtx);

-#if 0
+void func_809CE068(BgSpdweb* this);
+void func_809CE234(BgSpdweb* this, GlobalContext* globalCtx);
+void func_809CE4C8(BgSpdweb* this, GlobalContext* globalCtx);
+void func_809CE830(BgSpdweb* this, GlobalContext* globalCtx);
+void func_809CEBC0(BgSpdweb* this, GlobalContext* globalCtx);
+void func_809CEE74(BgSpdweb* this);
+void func_809CEEAC(BgSpdweb* this, GlobalContext* globalCtx);
+
 const ActorInit Bg_Spdweb_InitVars = {
    ACTOR_BG_SPDWEB,
    ACTORCAT_BG,
@ -28,89 +36,491 @@ const ActorInit Bg_Spdweb_InitVars = {
    (ActorFunc)BgSpdweb_Draw,
 };

-// static ColliderTrisElementInit sTrisElementsInit[2] = {
-static ColliderTrisElementInit D_809CF080[2] = {
+static ColliderTrisElementInit sTrisElementsInit1[2] = {
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000C00, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0x00000C00, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_NONE,
+        },
        { { { 75.0f, -8.0f, 75.0f }, { 75.0f, -8.0f, -75.0f }, { -75.0f, -8.0f, -75.0f } } },
    },
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000C00, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0x00000C00, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_NONE,
+        },
        { { { 75.0f, -8.0f, 75.0f }, { -75.0f, -8.0f, -75.0f }, { -75.0f, -8.0f, 75.0f } } },
    },
 };

-// static ColliderTrisInit sTrisInit = {
-static ColliderTrisInit D_809CF0F8 = {
-    { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_2, COLSHAPE_TRIS, },
-    2, D_809CF080, // sTrisElementsInit,
+static ColliderTrisInit sTrisInit1 = {
+    {
+        COLTYPE_NONE,
+        AT_NONE,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_NONE,
+        OC2_TYPE_2,
+        COLSHAPE_TRIS,
+    },
+    2,
+    sTrisElementsInit1,
 };

-// static ColliderTrisElementInit sTrisElementsInit[4] = {
-static ColliderTrisElementInit D_809CF108[4] = {
+static ColliderTrisElementInit sTrisElementsInit2[4] = {
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0x00000800, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_NONE,
+        },
        { { { 70.0f, 160.0f, 15.0f }, { -70.0f, 160.0f, 15.0f }, { -70.0f, 20.0f, 15.0f } } },
    },
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0x00000800, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_NONE,
+        },
        { { { 70.0f, 160.0f, 15.0f }, { -70.0f, 20.0f, 15.0f }, { 70.0f, 20.0f, 15.0f } } },
    },
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0x00000800, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_NONE,
+        },
        { { { -70.0f, 160.0f, -15.0f }, { 70.0f, 160.0f, -15.0f }, { 70.0f, 20.0f, -15.0f } } },
    },
    {
-        { ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x00, 0x00 }, { 0x00000800, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
+        {
+            ELEMTYPE_UNK0,
+            { 0xF7CFFFFF, 0x00, 0x00 },
+            { 0x00000800, 0x00, 0x00 },
+            TOUCH_NONE | TOUCH_SFX_NORMAL,
+            BUMP_ON,
+            OCELEM_NONE,
+        },
        { { { -70.0f, 160.0f, -15.0f }, { 70.0f, 20.0f, -15.0f }, { -70.0f, 20.0f, -15.0f } } },
    },
 };

-// static ColliderTrisInit sTrisInit = {
-static ColliderTrisInit D_809CF1F8 = {
-    { COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_TYPE_2, COLSHAPE_TRIS, },
-    4, D_809CF108, // sTrisElementsInit,
+static ColliderTrisInit sTrisInit2 = {
+    {
+        COLTYPE_NONE,
+        AT_NONE,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_NONE,
+        OC2_TYPE_2,
+        COLSHAPE_TRIS,
+    },
+    4,
+    sTrisElementsInit2,
 };

-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_809CF210[] = {
+Color_RGBA8 D_809CF208 = { 255, 255, 150, 170 };
+
+Color_RGBA8 D_809CF20C = { 255, 0, 0, 0 };
+
+static InitChainEntry sInitChain[] = {
    ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_CONTINUE),
    ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
 };

+void BgSpdweb_Init(Actor* thisx, GlobalContext* globalCtx) {
+    BgSpdweb* this = THIS;
+
+    Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
+    this->unk_161 = 0;
+    this->switchFlag = BGSPDWEB_GET_SWITCHFLAG(&this->dyna.actor);
+    thisx->params &= 0xFF;
+    DynaPolyActor_Init(&this->dyna, 1);
+
+    if (this->dyna.actor.params == BGSPDWEB_FF_0) {
+        Collider_InitAndSetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInit1, this->colliderElements);
+        func_809CE068(this);
+        DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_spdweb_Colheader_002678);
+        this->unk_2F8 = globalCtx->colCtx.dyna.bgActors[this->dyna.bgId].colHeader->vtxList;
+        this->unk_164 = 0.0f;
+        this->actionFunc = func_809CE4C8;
+    } else {
+        Collider_InitAndSetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInit2, this->colliderElements);
+        func_809CE068(this);
+        DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_spdweb_Colheader_0011C0);
+        this->actionFunc = func_809CEBC0;
+        Actor_SetFocus(&this->dyna.actor, 30.0f);
+    }
+
+    this->unk_162 = 0;
+
+    if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
+        Actor_MarkForDeath(&this->dyna.actor);
+    }
+}
+
+void BgSpdweb_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    BgSpdweb* this = THIS;
+
+    DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
+    Collider_DestroyTris(globalCtx, &this->collider);
+}
+
+void func_809CE068(BgSpdweb* this) {
+    Vec3f sp64[3];
+    s32 i;
+    s32 j;
+
+    Matrix_SetStateRotationAndTranslation(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
+                                          this->dyna.actor.world.pos.z, &this->dyna.actor.shape.rot);
+
+    for (i = 0; i < this->collider.count; i++) {
+        for (j = 0; j < ARRAY_COUNT(sp64); j++) {
+            Matrix_MultiplyVector3fByState(this->collider.elements[i].dim.vtx + j, &sp64[j]);
+        }
+        Collider_SetTrisVertices(&this->collider, i, &sp64[0], &sp64[1], &sp64[2]);
+    }
+}
+
+void func_809CE15C(BgSpdweb* this) {
+    this->unk_2F8[0].y = this->unk_2F8[3].y = this->unk_2F8[10].y = this->unk_2F8[11].y = this->unk_2F8[12].y =
+        this->unk_2F8[13].y = this->unk_2F8[14].y = this->unk_2F8[15].y =
+            (this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y) * 10.0f;
+}
+
+void func_809CE1D0(BgSpdweb* this, GlobalContext* globalCtx) {
+    this->unk_162 = 30;
+    Flags_SetSwitch(globalCtx, this->switchFlag);
+
+    if (this->dyna.actor.params == BGSPDWEB_FF_0) {
+        this->actionFunc = func_809CE234;
+    } else {
+        this->actionFunc = func_809CE830;
+    }
+}
+
+void func_809CE234(BgSpdweb* this, GlobalContext* globalCtx) {
+    Vec3f spB4;
+    Vec3f spA8;
+    f32 temp_f20;
+    f32 temp_f22;
+    f32 temp_f24;
+    s16 phi_s2;
+    s16 temp_s0;
+    s32 i;
+
+    if (this->unk_162 != 0) {
+        this->unk_162--;
+    }
+
+    if (this->unk_162 == 0) {
+        ActorCutscene_Stop(this->dyna.actor.cutscene);
+        Actor_MarkForDeath(&this->dyna.actor);
+        return;
+    }
+
+    if ((this->unk_162 % 3) == 0) {
+        phi_s2 = Rand_ZeroOne() * 10922.0f;
+        spB4.y = 0.0f;
+        spA8.y = this->dyna.actor.world.pos.y;
+
+        for (i = 0; i < 6; i++) {
+            temp_s0 = (s32)randPlusMinusPoint5Scaled(10240.0f) + phi_s2;
+            temp_f24 = Math_SinS(temp_s0);
+            temp_f22 = Math_CosS(temp_s0);
+
+            spA8.x = this->dyna.actor.world.pos.x + (120.0f * temp_f24);
+            spA8.z = this->dyna.actor.world.pos.z + (120.0f * temp_f22);
+
+            temp_f20 = Math_Vec3f_DistXZ(&this->dyna.actor.home.pos, &spA8) * (1.0f / 120.0f);
+            if (temp_f20 < 0.7f) {
+                temp_f20 = 1.0f - temp_f20;
+                temp_f24 = Math_SinS(BINANG_ROT180(temp_s0));
+                temp_f22 = Math_CosS(BINANG_ROT180(temp_s0));
+            }
+
+            spB4.x = 7.0f * temp_f24 * temp_f20;
+            spB4.y = 0.0f;
+            spB4.z = 7.0f * temp_f22 * temp_f20;
+
+            EffectSsDeadDb_Spawn(globalCtx, &this->dyna.actor.home.pos, &spB4, &gZeroVec3f, &D_809CF208, &D_809CF20C,
+                                 0x32, 8, 0xE);
+            phi_s2 += 0x2AAA;
+        }
+
+        SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->dyna.actor.home.pos, 11, NA_SE_EN_EXTINCT);
+    }
+}
+
+void func_809CE4C8(BgSpdweb* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+    Vec3f sp40;
+    ColliderTrisElement* element;
+    s16 sp3A;
+    s32 i;
+    f32 temp_f12;
+
+    sp40.x = this->dyna.actor.world.pos.x;
+    sp40.y = this->dyna.actor.world.pos.y - 50.0f;
+    sp40.z = this->dyna.actor.world.pos.z;
+    sp3A = player->unk_B6A;
+
+    if (func_80123F48(globalCtx, &sp40, 70.0f, 50.0f)) {
+        this->dyna.actor.home.pos.x = player->swordInfo[0].tip.x;
+        this->dyna.actor.home.pos.z = player->swordInfo[0].tip.z;
+        func_809CEE74(this);
+        return;
+    }
+
+    if (this->collider.base.acFlags & AC_HIT) {
+        for (i = 0; i < 2; i++) {
+            element = &this->collider.elements[i];
+            if (element->info.bumperFlags & BUMP_HIT) {
+                if (this->collider.elements[i].info.acHitInfo->toucher.dmgFlags & 0x800) {
+                    Math_Vec3s_ToVec3f(&this->dyna.actor.home.pos, &element->info.bumper.hitPos);
+                    func_809CEE74(this);
+                    return;
+                }
+
+                if (DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
+                    sp3A = 300;
+                    break;
+                }
+            }
+        }
+    }
+
+    if (DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
+        temp_f12 = 2.0f * sqrtf(CLAMP_MIN(sp3A, 0));
+        if ((this->unk_164 < temp_f12) && (temp_f12 > 2.0f)) {
+            this->unk_164 = temp_f12;
+            this->unk_162 = 12;
+            if (sp3A > 50) {
+                player->stateFlags1 |= 0x20;
+                this->unk_161 = 1;
+            }
+        } else if (player->actor.speedXZ != 0.0f) {
+            this->unk_164 = CLAMP_MIN(this->unk_164, 2.0f);
+        }
+    }
+
+    if (this->unk_162 != 0) {
+        this->unk_162--;
+    }
+
+    this->dyna.actor.world.pos.y = (sin_rad(this->unk_162 * (M_PI / 6)) * this->unk_164) + this->dyna.actor.home.pos.y;
+    Math_ApproachZeroF(&this->unk_164, 1.0f, 0.8f);
+
+    if (this->unk_162 == 4) {
+        if ((this->unk_161 != 0) ||
+            ((DynaPolyActor_IsInRidingMovingState(&this->dyna) != 0) && (this->unk_164 > 2.0f))) {
+            player->actor.velocity.y = this->unk_164 * 0.7f;
+            player->unk_B68 = (SQ(this->unk_164) * 0.15f) + this->dyna.actor.world.pos.y;
+            this->unk_161 = 0;
+            player->stateFlags1 &= ~0x20;
+        }
+    } else if (this->unk_162 == 11) {
+        if (this->unk_164 > 3.0f) {
+            Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WEB_VIBRATION);
+        } else {
+            func_801A75E8(NA_SE_EV_WEB_VIBRATION);
+        }
+    }
+
+    if (this->unk_162 == 0) {
+        this->unk_162 = 12;
+    }
+
+    func_809CE15C(this);
+    CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+}
+
+#ifdef NON_MATCHING
+void func_809CE830(BgSpdweb* this, GlobalContext* globalCtx) {
+    Vec3f spDC;
+    Vec3f spD0;
+    Vec3f spC4;
+    f32 spB0;
+    f32 spA4;
+    f32 sp9C;
+    f32 sp94;
+    f32 sp90;
+    f32 temp_f20;
+    f32 temp_f22;
+    f32 temp_f28;
+    f32 temp_f30;
+    s32 i;
+    s16 temp_s0;
+    s16 temp_s3;
+
+    if (this->unk_162 != 0) {
+        this->unk_162--;
+    }
+
+    if (this->unk_162 == 0) {
+        if (ActorCutscene_GetLength(this->dyna.actor.cutscene) == -1) {
+            ActorCutscene_Stop(this->dyna.actor.cutscene);
+        }
+        Actor_MarkForDeath(&this->dyna.actor);
+        return;
+    }
+
+    if ((this->unk_162 % 3) == 0) {
+        temp_s3 = Rand_ZeroOne() * 0x2AAA;
+        spB0 = Math_CosS(this->dyna.actor.shape.rot.x);
+        temp_f20 = Math_SinS(this->dyna.actor.shape.rot.x);
+        temp_f30 = Math_CosS(this->dyna.actor.shape.rot.y);
+        spA4 = Math_SinS(this->dyna.actor.shape.rot.y);
+        if (1) {}
+
+        spC4.x = this->dyna.actor.world.pos.x + ((90.0f * temp_f20) * spA4);
+        spC4.y = this->dyna.actor.world.pos.y + (90.0f * spB0);
+        spC4.z = this->dyna.actor.world.pos.z + ((90.0f * temp_f20) * temp_f30);
+
+        sp94 = temp_f20 * spA4;
+        sp90 = temp_f20 * temp_f30;
+
+        for (i = 0; i < 6; i++) {
+            temp_s0 = (s32)randPlusMinusPoint5Scaled(0x2800) + temp_s3;
+            temp_f20 = Math_SinS(temp_s0);
+            temp_f22 = Math_CosS(temp_s0);
+
+            spD0.x = spC4.x + (90.0f * ((sp94 * temp_f22) + (temp_f30 * temp_f20)));
+            spD0.y = spC4.y + ((90.0f * spB0) * temp_f22);
+            spD0.z = spC4.z + (90.0f * ((sp90 * temp_f22) - (spA4 * temp_f20)));
+
+            temp_f28 = Math_Vec3f_DistXYZ(&this->dyna.actor.home.pos, &spD0) * (1.0f / 90.0f);
+            if (temp_f28 < 0.65f) {
+                temp_f28 = 1.0f - temp_f28;
+                temp_f20 = Math_SinS(BINANG_ROT180(temp_s0));
+                temp_f22 = Math_CosS(BINANG_ROT180(temp_s0));
+            }
+
+            spDC.x = (6.5f * temp_f28) * ((temp_f30 * temp_f20) + (temp_f22 * sp94));
+            spDC.y = temp_f22 * ((6.5f * temp_f28) * spB0);
+            spDC.z = (6.5f * temp_f28) * ((temp_f22 * sp90) - (spA4 * temp_f20));
+
+            EffectSsDeadDb_Spawn(globalCtx, &this->dyna.actor.home.pos, &spDC, &gZeroVec3f, &D_809CF208, &D_809CF20C,
+                                 0x3C, 8, 0xE);
+            temp_s3 += 0x2AAA;
+        }
+
+        SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->dyna.actor.home.pos, 11, NA_SE_EN_EXTINCT);
+    }
+}
+#else
+#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE830.s")
 #endif

-extern ColliderTrisElementInit D_809CF080[2];
-extern ColliderTrisInit D_809CF0F8;
-extern ColliderTrisElementInit D_809CF108[4];
-extern ColliderTrisInit D_809CF1F8;
-extern InitChainEntry D_809CF210[];
+void func_809CEBC0(BgSpdweb* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+    f32 sp58;
+    f32 temp_f10;
+    f32 temp_f18;
+    ColliderTrisElement* ptr;
+    s32 i;
+    Vec3f sp3C;
+    f32 sp38;
+    f32 sp34;
+    f32 sp30;
+    f32 sp2C;

-extern UNK_TYPE D_06000060;
-extern UNK_TYPE D_06002678;
+    if (this->collider.base.acFlags & AC_HIT) {
+        for (i = 0; i < ARRAY_COUNT(this->colliderElements); i++) {
+            ptr = &this->collider.elements[i];
+            if (ptr->info.bumperFlags & BUMP_HIT) {
+                Math_Vec3s_ToVec3f(&this->dyna.actor.home.pos, &ptr->info.bumper.hitPos);
+                break;
+            }
+        }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/BgSpdweb_Init.s")
+        if (i == ARRAY_COUNT(this->colliderElements)) {
+            this->dyna.actor.home.pos.x =
+                ((90.0f * Math_SinS(this->dyna.actor.shape.rot.x)) * Math_SinS(this->dyna.actor.shape.rot.y)) +
+                this->dyna.actor.world.pos.x;
+            this->dyna.actor.home.pos.y =
+                (90.0f * Math_CosS(this->dyna.actor.shape.rot.x)) + this->dyna.actor.world.pos.y;
+            this->dyna.actor.home.pos.z =
+                ((90.0f * Math_SinS(this->dyna.actor.shape.rot.x)) * Math_CosS(this->dyna.actor.shape.rot.y)) +
+                this->dyna.actor.world.pos.z;
+        }
+        func_809CEE74(this);
+    } else if ((player->itemActionParam == 7) && (player->unk_B28 != 0)) {
+        Math_Vec3f_Diff(&player->swordInfo[0].tip, &this->dyna.actor.world.pos, &sp3C);
+        sp38 = Math_SinS(-this->dyna.actor.shape.rot.x);
+        sp34 = Math_CosS(-this->dyna.actor.shape.rot.x);
+        sp30 = Math_SinS(-this->dyna.actor.shape.rot.y);
+        sp2C = Math_CosS(-this->dyna.actor.shape.rot.y);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/BgSpdweb_Destroy.s")
+        temp_f18 = ((sp3C.x * sp38 * sp30) + (sp3C.y * sp34)) - (sp3C.z * sp38 * sp2C);
+        sp58 = (-sp3C.x * sp34 * sp30) + (sp3C.y * sp38) + (sp3C.z * sp34 * sp2C);
+        temp_f10 = (sp3C.x * sp2C) + (sp3C.z * sp30);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE068.s")
+        if ((fabsf(temp_f10) < 70.0f) && (fabsf(sp58) < 10.0f) && (temp_f18 < 160.0f) && (temp_f18 > 20.0f)) {
+            Math_Vec3f_Copy(&this->dyna.actor.home.pos, &player->swordInfo[0].tip);
+            func_809CEE74(this);
+        }
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE15C.s")
+    CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE1D0.s")
+void func_809CEE74(BgSpdweb* this) {
+    ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+    this->actionFunc = func_809CEEAC;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE234.s")
+void func_809CEEAC(BgSpdweb* this, GlobalContext* globalCtx) {
+    if (ActorCutscene_GetCanPlayNext(this->dyna.actor.cutscene)) {
+        ActorCutscene_StartAndSetUnkLinkFields(this->dyna.actor.cutscene, &this->dyna.actor);
+        func_809CE1D0(this, globalCtx);
+    } else {
+        ActorCutscene_SetIntentToPlay(this->dyna.actor.cutscene);
+    }
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE4C8.s")
+void BgSpdweb_Update(Actor* thisx, GlobalContext* globalCtx) {
+    BgSpdweb* this = THIS;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CE830.s")
+    this->actionFunc(this, globalCtx);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CEBC0.s")
+void BgSpdweb_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    Gfx* gfx;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CEE74.s")
+    OPEN_DISPS(globalCtx->state.gfxCtx);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/func_809CEEAC.s")
+    gfx = POLY_XLU_DISP;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/BgSpdweb_Update.s")
+    gSPDisplayList(&gfx[0], &sSetupDL[6 * 25]);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Spdweb/BgSpdweb_Draw.s")
+    if (thisx->params == BGSPDWEB_FF_1) {
+        gSPMatrix(&gfx[1], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPDisplayList(&gfx[2], object_spdweb_DL_000060);
+    } else {
+        Matrix_InsertTranslation(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY);
+        Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY);
+
+        gSPMatrix(&gfx[1], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+        gSPDisplayList(&gfx[2], object_spdweb_DL_0012F0);
+    }
+
+    POLY_XLU_DISP = &gfx[3];
+
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
--- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
+++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.h
@ -7,11 +7,21 @@ struct BgSpdweb;

 typedef void (*BgSpdwebActionFunc)(struct BgSpdweb*, GlobalContext*);

+#define BGSPDWEB_GET_SWITCHFLAG(thisx) (((thisx)->params >> 8) & 0x7F)
+
+#define BGSPDWEB_FF_0 0
+#define BGSPDWEB_FF_1 1
+
 typedef struct BgSpdweb {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x18];
+    /* 0x0000 */ DynaPolyActor dyna;
    /* 0x015C */ BgSpdwebActionFunc actionFunc;
-    /* 0x0160 */ char unk_160[0x19C];
+    /* 0x0160 */ u8 switchFlag;
+    /* 0x0161 */ u8 unk_161;
+    /* 0x0162 */ s16 unk_162;
+    /* 0x0164 */ f32 unk_164;
+    /* 0x0168 */ ColliderTris collider;
+    /* 0x0188 */ ColliderTrisElement colliderElements[4];
+    /* 0x02F8 */ Vec3s* unk_2F8;
 } BgSpdweb; // size = 0x2FC

 extern const ActorInit Bg_Spdweb_InitVars;
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@ -719,13 +719,6 @@ D_06002CE0 = 0x06002CE0;

 D_06000048 = 0x06000048;

-// ovl_Bg_Spdweb
-
-D_06000060 = 0x06000060;
-D_060011C0 = 0x060011C0;
-D_060012F0 = 0x060012F0;
-D_06002678 = 0x06002678;
-
 // ovl_Bg_Spout_Fire

 D_06000040 = 0x06000040;