diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 574ca9cb6e..5a99a8b56b 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -938,39 +938,29 @@ void func_80A76DDC(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) { &D_801333E8); } -static Vec3f D_80A784F4 = { 0.0f, 0.0f, 0.0f }; -static Vec3f D_80A78500 = { 0.0f, 0.3f, 0.0f }; - -static Color_RGBA8 D_80A7850C = { 200, 200, 200, 255 }; -static Color_RGBA8 D_80A78510 = { 150, 150, 150, 0 }; - -static Vec3f D_80A78514[] = { - { 1000.0, -1000.0, 1000.0 }, { 0.0, -1000.0, 0.0 }, { -1000.0, -5000.0, -4000.0 }, - { 1000.0, -5000.0, -3000.0 }, { -1000.0, 1000.0, -6000.0 }, { -1000.0, 3000.0, -5000.0 }, - { -800.0, 1000.0, -3000.0 }, { 0.0, -4000.0, -2000.0 }, { -1000.0, -2000.0, -6000.0 }, - { 1000.0, -3000.0, 0.0 }, { 2000.0, -2000.0, -4000.0 }, { -1000.0, 0.0, -6000.0 }, - { 1000.0, -2000.0, -2000.0 }, { 0.0, -2000.0, 2100.0 }, { 0.0, 0.0, 0.0 }, - { 1000.0, -1000.0, -6000.0 }, { 2000.0, 0.0, -3000.0 }, { -1000.0, -1000.0, -4000.0 }, - { 900.0, -800.0, 2700.0 }, { 720.0f, 900.0f, 2500.0f }, -}; - void func_80A76E2C(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) { - s32 pad; - Vec3f effectVelocity; - Vec3f effectAccel; - s32 i; - Color_RGBA8 primColor; - Color_RGBA8 envColor; - s32 temp_v0; - Vec3f effectPos; + static Vec3f D_80A78514[] = { + { 1000.0, -1000.0, 1000.0 }, { 0.0, -1000.0, 0.0 }, { -1000.0, -5000.0, -4000.0 }, + { 1000.0, -5000.0, -3000.0 }, { -1000.0, 1000.0, -6000.0 }, { -1000.0, 3000.0, -5000.0 }, + { -800.0, 1000.0, -3000.0 }, { 0.0, -4000.0, -2000.0 }, { -1000.0, -2000.0, -6000.0 }, + { 1000.0, -3000.0, 0.0 }, { 2000.0, -2000.0, -4000.0 }, { -1000.0, 0.0, -6000.0 }, + { 1000.0, -2000.0, -2000.0 }, { 0.0, -2000.0, 2100.0 }, { 0.0, 0.0, 0.0 }, + { 1000.0, -1000.0, -6000.0 }, { 2000.0, 0.0, -3000.0 }, { -1000.0, -1000.0, -4000.0 }, + { 900.0, -800.0, 2700.0 }, { 720.0f, 900.0f, 2500.0f }, + }; if (this->unk_4D4 == 0) { - effectVelocity = D_80A784F4; - effectAccel = D_80A78500; + s32 pad; + Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; + Vec3f effectAccel = { 0.0f, 0.3f, 0.0f }; + s32 i; for (i = ARRAY_COUNT(D_80A78514) - 1; i >= 0; i--) { - primColor = D_80A7850C; - envColor = D_80A78510; + Color_RGBA8 primColor = { 200, 200, 200, 255 }; + Color_RGBA8 envColor = { 150, 150, 150, 0 }; + s32 temp_v0; + Vec3f effectPos; + Matrix_MultVec3f(&D_80A78514[i], &effectPos); temp_v0 = (Math_Rand_ZeroOne() * 20.0f) - 10.0f; primColor.r += temp_v0;