EntityStrongWargDeathBeams (#1585)

Thanks again @joshlory @bismurphy for the help!
Xeeynamo · Sep 6, 2024 · ed1689d · ed1689d
1 parent 4870071
commit ed1689d
Show file tree

Hide file tree

Showing 3 changed files with 142 additions and 1 deletion.
diff --git a/include/entity.h b/include/entity.h
@@ -1725,6 +1725,11 @@ typedef struct {
     /* 0x88 */ u8 unk88;
 } ET_NZ0_311C0;
 
+typedef struct {
+    /* 0x7C */ s16 unk7C;
+    /* 0x7E */ s16 unk7E;
+} ET_StrongWargDeathBeams;
+
 // ====== RIC ENTITIES ======
 
 // ==========================
@@ -1865,6 +1870,7 @@ typedef union { // offset=0x7C
     ET_ZombieSpawner zombieSpawner;
     ET_Skeleton skeleton;
     ET_NZ0_311C0 nz0311c0;
+    ET_StrongWargDeathBeams strongWargDeathBeams;
 } Ext;
 
 #define SYNC_FIELD(struct1, struct2, field_name)                               \

diff --git a/src/st/no3/48A84.c b/src/st/no3/48A84.c
@@ -247,7 +247,140 @@ INCLUDE_ASM("st/no3/nonmatchings/48A84", EntityStrongWargWaveAttack);
 INCLUDE_ASM("st/no3/nonmatchings/48A84", EntityUnkId2F);
 
 // beams that go up when strong warg dies
-INCLUDE_ASM("st/no3/nonmatchings/48A84", EntityStrongWargDeathBeams);
+void EntityStrongWargDeathBeams(Entity* self) {
+    Primitive* prim;
+    s16 baseX;
+    u16 hiddenPrimCount;
+    u16 palette;
+    s32 primIndex;
+    s32 temp_s1;
+    u16 temp_s1_u16;
+
+    switch (self->step) {
+    case 0:
+        palette = self->palette + 4;
+        temp_s1 = self->unk5A + 3;
+        temp_s1_u16 = (u16)temp_s1;
+
+        InitializeEntity(g_eInitGeneric2);
+        primIndex = g_api.AllocPrimitives(PRIM_GT4, 4);
+
+        if (primIndex == -1) {
+            DestroyEntity(self);
+            return;
+        }
+
+        self->primIndex = primIndex;
+        self->flags |= FLAG_HAS_PRIMS;
+        prim = &g_PrimBuf[primIndex];
+
+        while (prim != NULL) {
+            prim->tpage = temp_s1_u16 / 4;
+            prim->clut = palette;
+            prim->u0 = prim->u1 = ((temp_s1 & 1) << 7) + 0x21;
+            prim->v1 = prim->v3 = ((temp_s1 & 2) << 6) + 0x59;
+            prim->v0 = prim->v2 = ((temp_s1 & 2) << 6) + 0x7F;
+            prim->u3 = prim->u2 = prim->u0 + 0x2D;
+            prim->drawMode = DRAW_HIDE;
+            prim = prim->next;
+        }
+        break;
+    case 1:
+        if ((self->ext.strongWargDeathBeams.unk7C == 0) &&
+            (self->ext.strongWargDeathBeams.unk7E < 0x14)) {
+            prim = &g_PrimBuf[self->primIndex];
+
+            while (prim != NULL) {
+                if (prim->drawMode == DRAW_HIDE) {
+                    if (self->ext.strongWargDeathBeams.unk7E & 1) {
+                        PlaySfxPositional(SFX_EXPLODE_B);
+                    }
+
+                    if (self->facingLeft != 0) {
+                        baseX =
+                            self->posX.i.hi -
+                            D_80183080[self->ext.strongWargDeathBeams.unk7E &
+                                       0xF];
+                        prim->x0 = prim->x2 = baseX + 0x10;
+                        prim->x1 = prim->x3 = baseX - 0x10;
+                    } else {
+                        baseX =
+                            self->posX.i.hi +
+                            D_80183080[self->ext.strongWargDeathBeams.unk7E &
+                                       0xF];
+                        prim->x0 = prim->x2 = baseX - 0x10;
+                        prim->x1 = prim->x3 = baseX + 0x10;
+                    }
+
+                    prim->y0 = prim->y1 = prim->y2 = prim->y3 =
+                        self->posY.i.hi + 0x28;
+                    prim->b1 = prim->b3 = prim->g1 = prim->g3 = prim->r1 =
+                        prim->r3 = prim->b0 = prim->b2 = prim->g0 = prim->g2 =
+                            prim->r0 = prim->r2 = 0x40;
+
+                    prim->priority =
+                        self->zPriority +
+                        D_801830A0[self->ext.strongWargDeathBeams.unk7E & 0xF];
+                    prim->drawMode = DRAW_TPAGE2 | DRAW_TPAGE | DRAW_COLORS |
+                                     DRAW_UNK02 | DRAW_TRANSP;
+                    prim->p1 = (Random() & 3) + 0x10;
+                    prim->p2 = 0;
+                    break;
+                }
+
+                prim = prim->next;
+            }
+
+            self->ext.strongWargDeathBeams.unk7C = 4;
+            self->ext.strongWargDeathBeams.unk7E++;
+        } else {
+            self->ext.strongWargDeathBeams.unk7C--;
+        }
+
+        prim = &g_PrimBuf[self->primIndex];
+        hiddenPrimCount = 0;
+
+        while (prim != NULL) {
+            if (prim->drawMode != DRAW_HIDE) {
+                prim->p2++;
+                prim->x0 = prim->x2 = prim->x2 + 1;
+                prim->x1 = prim->x3 = prim->x3 - 1;
+
+                if (prim->p2 > 8) {
+                    prim->r0 = prim->r1 = prim->r1 - 0x10;
+                    prim->g0 = prim->g1 = prim->g1 - 0x10;
+                    prim->b0 = prim->b1 = prim->b1 - 0x10;
+
+                    if (prim->r2) {
+                        prim->r2 = prim->r3 = prim->r3 - 0x14;
+                        prim->g2 = prim->g3 = prim->g3 - 0x14;
+                        prim->b2 = prim->b3 = prim->b3 - 0x14;
+                    }
+                } else {
+                    prim->r0 = prim->r2 = prim->r1 = prim->r3 = prim->r3 + 0x10;
+                    prim->g0 = prim->g2 = prim->g1 = prim->g3 = prim->g3 + 0x10;
+                    prim->b0 = prim->b2 = prim->b1 = prim->b3 = prim->b3 + 0x10;
+                }
+
+                prim->y0 = prim->y1 = prim->y1 - prim->p1;
+
+                if (prim->p2 > 0x10) {
+                    prim->drawMode = DRAW_HIDE;
+                }
+            } else {
+                hiddenPrimCount++;
+            }
+            prim = prim->next;
+        }
+
+        if (hiddenPrimCount == 4 &&
+            self->ext.strongWargDeathBeams.unk7E > 0x13) {
+            DestroyEntity(self);
+            return;
+        }
+        break;
+    }
+}
 
 void func_801CF438(Entity* entity, u8 count, u8 params, s32 xDist, s32 yDist,
                    u8 arg5, s16 xOfst) {

diff --git a/src/st/no3/no3.h b/src/st/no3/no3.h
@@ -182,6 +182,8 @@ extern u16 D_80182628[];
 extern s32 D_80182638[];
 extern u8 D_8018267C[];
 extern ObjInit D_80182764[];
+extern u16 D_80183080[];
+extern u16 D_801830A0[];
 extern u8 D_8018383C[];
 extern s32 D_801838F4[];
 extern s16 D_80183858[];