From 7b04a7cfeb714738798adce81cd7d1c031ba521e Mon Sep 17 00:00:00 2001 From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 00:27:21 -0700 Subject: [PATCH] Figure out types for a lot of data --- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 35 ++++++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) 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 284979404b..3d263a9280 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -88,19 +88,33 @@ static DamageTable sDamageTable = { { 0xEF, 0x60, 0x60, 0x60, 0x00, 0x00, 0xF1, 0xF4, 0xF2, 0xF2, 0xF8, 0xF4, 0xFA, 0x00, 0xF4, 0x00, } }; -UNK_TYPE D_80A78464[] = { 0x00000000, 0x3F000000, 0x00000000, 0x43960000, 0x00000000, 0x00000000 }; -UNK_TYPE D_80A7847C[] = { 0x44480000, 0xC3480000, 0xC5A28000 }; -UNK_TYPE D_80A78488[] = { 0x00000000, 0x00000000, 0x00000000 }; -UNK_TYPE D_80A78494[] = { 0xC3480000, 0xC5098000, 0xC3480000 }; -UNK_TYPE D_80A784A0[] = { 0xC5BB8000, 0x44FA0000, 0xC53B8000 }; +Vec3f D_80A78464[] = { 0.0f, 0.5f, 0.0f }; + +// unused +Vec3f D_80A78470[] = { 300.0f, 0.0f, 0.0f }; + +Vec3f D_80A7847C[] = { 800.0f, -200.0f, -5200.0f }; + +Vec3f D_80A78488[] = { 0.0f, 0.0f, 0.0f }; + +Vec3f D_80A78494[] = { -200.0f, -2200.0f, -200.0f }; + +Vec3f D_80A784A0[] = { -6000.0f, 2000.0f, -3000.0f }; + UNK_TYPE D_80A784AC[] = { 0xC53B8000, 0xC42F0000, 0xC59C4000, 0xC53B8000, 0xC42F0000, 0x44FA0000, 0x457A0000, 0xC42F0000, 0x44FA0000 }; + UNK_TYPE D_80A784D0[] = { 0x457A0000, 0xC42F0000, 0x44FA0000, 0x457A0000, 0xC42F0000, 0xC59C4000, 0xC53B8000, 0xC42F0000, 0xC59C4000 }; -UNK_TYPE D_80A784F4[] = { 0x00000000, 0x00000000, 0x00000000 }; -UNK_TYPE D_80A78500[] = { 0x00000000, 0x3E99999A, 0x00000000 }; -UNK_TYPE D_80A7850C[] = { 0xC8C8C8FF }; -UNK_TYPE D_80A78510[] = { 0x96969600 }; + +Vec3f D_80A784F4[] = { 0.0f, 0.0f, 0.0f }; + +Vec3f D_80A78500[] = { 0.0f, 0.3f, 0.0f }; + +Color_RGBA8 D_80A7850C[] = { 200, 200, 200, 255 }; + +Color_RGBA8 D_80A78510[] = { 150, 150, 150, 0 }; + UNK_TYPE D_80A78514[] = { 0x447A0000, 0xC47A0000, 0x447A0000, 0x00000000, 0xC47A0000, 0x00000000, 0xC47A0000, 0xC59C4000, 0xC57A0000, 0x447A0000, 0xC59C4000, 0xC53B8000, 0xC47A0000, 0x447A0000, 0xC5BB8000, 0xC47A0000, 0x453B8000, 0xC59C4000, 0xC4480000, 0x447A0000, 0xC53B8000, @@ -110,7 +124,8 @@ UNK_TYPE D_80A78514[] = { 0x447A0000, 0xC47A0000, 0x447A0000, 0x00000000, 0xC47A 0x00000000, 0x00000000, 0x00000000, 0x447A0000, 0xC47A0000, 0xC5BB8000, 0x44FA0000, 0x00000000, 0xC53B8000, 0xC47A0000, 0xC47A0000, 0xC57A0000, 0x44610000, 0xC4480000, 0x4528C000 }; -UNK_TYPE D_80A785F8[] = { 0x44340000, 0x44610000, 0x451C4000 }; + +Vec3f D_80A785F8[] = { 720.0f, 900.0f, 2500.0f }; static EnIkActionFunc sActionFuncs[] = { func_80A77AEC, func_80A77B0C, func_80A77B3C, func_80A7748C, func_80A774BC, func_80A774F8,