mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-08 08:55:17 +00:00
Code Issues Projects Releases Wiki Activity

Move data into func_80A76E2C

Browse source
This commit is contained in:
Sirius902 2020-10-18 23:40:28 -07:00
parent 704d48043d
commit 12dd8045dd
1 changed files with 18 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -938,12 +938,7 @@ void func_80A76DDC(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) {
&D_801333E8); &D_801333E8);
} }
static Vec3f D_80A784F4 = { 0.0f, 0.0f, 0.0f }; void func_80A76E2C(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) {
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[] = { static Vec3f D_80A78514[] = {
{ 1000.0, -1000.0, 1000.0 }, { 0.0, -1000.0, 0.0 }, { -1000.0, -5000.0, -4000.0 }, { 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 }, { 1000.0, -5000.0, -3000.0 }, { -1000.0, 1000.0, -6000.0 }, { -1000.0, 3000.0, -5000.0 },
@ -954,23 +949,18 @@ static Vec3f D_80A78514[] = {
{ 900.0, -800.0, 2700.0 }, { 720.0f, 900.0f, 2500.0f }, { 900.0, -800.0, 2700.0 }, { 720.0f, 900.0f, 2500.0f },
}; };
void func_80A76E2C(EnIk* this, GlobalContext* globalCtx, Vec3f* pos) { if (this->unk_4D4 == 0) {
s32 pad; s32 pad;
Vec3f effectVelocity; Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f };
Vec3f effectAccel; Vec3f effectAccel = { 0.0f, 0.3f, 0.0f };
s32 i; s32 i;
Color_RGBA8 primColor;
Color_RGBA8 envColor; for (i = ARRAY_COUNT(D_80A78514) - 1; i >= 0; i--) {
Color_RGBA8 primColor = { 200, 200, 200, 255 };
Color_RGBA8 envColor = { 150, 150, 150, 0 };
s32 temp_v0; s32 temp_v0;
Vec3f effectPos; Vec3f effectPos;
if (this->unk_4D4 == 0) {
effectVelocity = D_80A784F4;
effectAccel = D_80A78500;
for (i = ARRAY_COUNT(D_80A78514) - 1; i >= 0; i--) {
primColor = D_80A7850C;
envColor = D_80A78510;
Matrix_MultVec3f(&D_80A78514[i], &effectPos); Matrix_MultVec3f(&D_80A78514[i], &effectPos);
temp_v0 = (Math_Rand_ZeroOne() * 20.0f) - 10.0f; temp_v0 = (Math_Rand_ZeroOne() * 20.0f) - 10.0f;
primColor.r += temp_v0; primColor.r += temp_v0;