Effect Firetail OK (#974)

* OK

* description

* gEffFire1DL

* format

* PR

src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c

@@ -1,27 +1,142 @@
 /*
  * File: z_eff_ss_fire_tail.c
  * Overlay: ovl_Effect_Ss_Fire_Tail
- * Description:
+ * Description: Fire (burned by something)
  */
 
 #include "z_eff_ss_fire_tail.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+
+#define rScale regs[0]
+#define rLifespan regs[1]
+#define rReg2 regs[2]
+#define rReg3 regs[3]
+#define rPrimColorR regs[4]
+#define rPrimColorG regs[5]
+#define rPrimColorB regs[6]
+#define rEnvColorR regs[7]
+#define rEnvColorG regs[8]
+#define rEnvColorB regs[9]
+#define rReg10 regs[10]
+#define rBodyPart regs[11]
+#define rType regs[12]
 
 #define PARAMS ((EffectSsFireTailInitParams*)initParamsx)
 
-s32 EffectSsFireTail_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
+u32 EffectSsFireTail_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
 void EffectSsFireTail_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsFireTail_Draw(PlayState* play, u32 index, EffectSs* this);
 
-#if 0
 const EffectSsInit Effect_Ss_Fire_Tail_InitVars = {
     EFFECT_SS_FIRE_TAIL,
     EffectSsFireTail_Init,
 };
 
-#endif
+u32 EffectSsFireTail_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) {
+    EffectSsFireTailInitParams* initParams = PARAMS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Init.s")
+    this->pos = initParams->pos;
+    this->vec = initParams->unk_14;
+    this->velocity.x = 0.0f;
+    this->velocity.y = 0.0f;
+    this->velocity.z = 0.0f;
+    this->accel.x = 0.0f;
+    this->accel.y = 0.0f;
+    this->accel.z = 0.0f;
+    this->life = initParams->life;
+    this->actor = initParams->actor;
+    this->draw = EffectSsFireTail_Draw;
+    this->update = EffectSsFireTail_Update;
+    this->rScale = initParams->scale * 1000.0f;
+    this->rLifespan = initParams->life;
+    this->rReg2 = -10;
+    this->rReg3 = -15;
+    if (initParams->unk_20 == 0) {
+        initParams->unk_20 = 1;
+    }
+    this->rReg10 = initParams->unk_20;
+    this->rPrimColorR = initParams->primColor.r;
+    this->rPrimColorG = initParams->primColor.g;
+    this->rPrimColorB = initParams->primColor.b;
+    this->rEnvColorR = initParams->envColor.r;
+    this->rEnvColorG = initParams->envColor.g;
+    this->rEnvColorB = initParams->envColor.b;
+    this->rBodyPart = initParams->bodyPart;
+    this->rType = initParams->type;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Draw.s")
+    return 1;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Effect_Ss_Fire_Tail/EffectSsFireTail_Update.s")
+void EffectSsFireTail_Draw(PlayState* play, u32 index, EffectSs* this) {
+    GraphicsContext* gfxCtx = play->state.gfxCtx;
+    s32 pad;
+    s16 yawDiff;
+    Vec3f scale;
+    f32 temp1;
+    f32 temp2;
+    f32 dist;
+
+    OPEN_DISPS(gfxCtx);
+
+    scale.x = scale.y = scale.z = 0.0f;
+
+    if (this->actor != NULL) {
+        this->vec = this->actor->velocity;
+
+        if (this->rBodyPart < 0) {
+            Matrix_Translate(this->pos.x + this->actor->world.pos.x, this->pos.y + this->actor->world.pos.y,
+                             this->pos.z + this->actor->world.pos.z, MTXMODE_NEW);
+        } else {
+            Player* player = GET_PLAYER(play);
+            s16 bodyPart = this->rBodyPart;
+
+            this->pos.x =
+                player->bodyPartsPos[bodyPart].x - (Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play))) * 5.0f);
+            this->pos.y = player->bodyPartsPos[bodyPart].y;
+            this->pos.z =
+                player->bodyPartsPos[bodyPart].z - (Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play))) * 5.0f);
+
+            Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
+        }
+    } else {
+        Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
+    }
+
+    yawDiff = Math_Vec3f_Yaw(&scale, &this->vec) - Camera_GetCamDirYaw(GET_ACTIVE_CAM(play));
+    temp1 = fabsf(Math_CosS(yawDiff));
+    temp2 = Math_SinS(yawDiff);
+    dist = Math_Vec3f_DistXZ(&scale, &this->vec) / (this->rReg10 * 0.1f);
+    Matrix_RotateYS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x8000, MTXMODE_APPLY);
+    Matrix_RotateZF(DEGF_TO_RADF(temp2 * this->rReg2 * dist), MTXMODE_APPLY);
+    temp2 = 1.0f - ((f32)(this->life + 1) / this->rLifespan);
+    temp2 = 1.0f - SQ(temp2);
+    scale.x = scale.y = scale.z = temp2 * (this->rScale * (0.001f * 0.01f));
+    Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY);
+    temp1 = (this->rReg3 * 0.01f * temp1 * dist) + 1.0f;
+
+    if (temp1 < 0.1f) {
+        temp1 = 0.1f;
+    }
+
+    Matrix_Scale(1.0f, temp1, 1.0f / temp1, MTXMODE_APPLY);
+
+    gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    func_8012C2DC(play->state.gfxCtx);
+    gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255);
+    gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0);
+    gSPSegment(
+        POLY_XLU_DISP++, 0x08,
+        Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (play->state.frames * -20) & 0x1FF, 32, 128));
+
+    if (this->rType != 0) {
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire2DL);
+    } else {
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
+    }
+
+    CLOSE_DISPS(gfxCtx);
+}
+
+void EffectSsFireTail_Update(PlayState* play, u32 index, EffectSs* this) {
+    this->rScale *= 0.9f;
+}

src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c

@@ -76,7 +76,7 @@ void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this) {
     }
 
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, gGameplayKeepDrawFlameDL);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(gfxCtx);
 }