Match the rest of actors.h (#254)

* Matched rest of actors and more

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

1 files changed, 43 insertions, 43 deletions

diff --git a/src/code_8003DC40.c b/src/code_8003DC40.c
index f6def030b..a3f029b26 100644
--- a/src/code_8003DC40.c
+++ b/src/code_8003DC40.c
@@ -59,9 +59,9 @@ UNUSED void func_8003DE4C(Player *player, Vec3f arg1) {
 }
 
 void func_8003E048(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
-    *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-    *arg6 += arg1[1] * player->unk_110.unk44 * 0.1;
-    *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+    *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+    *arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
+    *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
     func_8002A5F4(arg1, *arg4, arg2, 1, 2);
     if (player->unk_110.unk60[1] <= 0.8829f) {
         arg3[0] = ((player->unk_206 / 182) * 0xB4);
@@ -85,9 +85,9 @@ void func_8003E048(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
 }
 
 void func_8003E37C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
-    *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-    *arg6 += arg1[1] * player->unk_110.unk44 * 0.2;
-    *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+    *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+    *arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.2;
+    *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
     func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
     if ((player->unk_110.unk60[1] <= 0.7318f) || (player->unk_0F8 == 0x000C)) {
         arg3[0] = ((player->unk_206 / 182) * 0xB4);
@@ -113,9 +113,9 @@ void func_8003E37C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
 }
 
 void func_8003E6EC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
-    *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-    *arg6 += arg1[1] * player->unk_110.unk44 * 0.1;
-    *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+    *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+    *arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
+    *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
     func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
     if (player->unk_110.unk60[1] <= 0.8829f) {
         arg3[0] = ((player->unk_206 / 182) * 0xB4);
@@ -134,9 +134,9 @@ void func_8003E6EC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
 }
 
 void func_8003E9EC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
-    *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-    *arg6 += arg1[1] * player->unk_110.unk44 * 0.1;
-    *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+    *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+    *arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
+    *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
     func_8002A5F4(arg1, *arg4, arg2, 1.2f, 2);
     if (player->unk_110.unk60[1] <= 0.8357f) {
         arg3[0] = ((player->unk_206 / 182) * 0x78);
@@ -165,9 +165,9 @@ void func_8003E9EC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
 }
 
 void func_8003EE2C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
-    *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-    *arg6 += arg1[1] * player->unk_110.unk44 * 0.1;
-    *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+    *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+    *arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
+    *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
     func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
     if (player->unk_110.unk60[1] <= 0.8357f) {
         arg3[0] = ((player->unk_206 / 182) * 0x78);
@@ -186,9 +186,9 @@ void func_8003EE2C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
 }
 
 void func_8003F138(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4, f32 *arg5, f32 *arg6, f32 *arg7) {
-    *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-    *arg6 += arg1[1] * player->unk_110.unk44 * 0.1;
-    *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+    *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+    *arg6 += arg1[1] * player->unk_110.unk3C[2] * 0.1;
+    *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
     func_8002A5F4(arg1, *arg4, arg2, 0.5f, 2);
     if (player->unk_0F8 == 8) {
         player->unk_044 &= ~1;
@@ -217,9 +217,9 @@ void func_8003F46C(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
     arg1[1] = -player->unk_110.unk60[1];
     arg1[2] = -player->unk_110.unk60[2];
     if ((player->unk_110.unk60[1] < 0.0f) && ((player->unk_0CA & 2) == 0)) {
-        *arg5 += arg1[0] * player->unk_110.unk44 * 1;
-        *arg6 += arg1[1] * player->unk_110.unk44 * 1;
-        *arg7 += arg1[2] * player->unk_110.unk44 * 1;
+        *arg5 += arg1[0] * player->unk_110.unk3C[2] * 1;
+        *arg6 += arg1[1] * player->unk_110.unk3C[2] * 1;
+        *arg7 += arg1[2] * player->unk_110.unk3C[2] * 1;
         func_8002A5F4(arg1, *arg4, arg2, 1.2f, 0.0f);
         player->kartHopJerk = 0.0f;
         player->kartHopAcceleration = 0.0f;
@@ -265,39 +265,39 @@ void func_8003F734(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
     arg1[1] = -player->unk_110.unk48[1];
     arg1[2] = -player->unk_110.unk48[2];
     if (player->unk_110.unk48[1] == 0) {
-        *arg4 += arg1[0] * player->unk_110.unk3C * 1;
-        *arg5 += arg1[1] * player->unk_110.unk3C * 0.1;
-        *arg6 += arg1[2] * player->unk_110.unk3C * 1;
+        *arg4 += arg1[0] * player->unk_110.unk3C[0] * 1;
+        *arg5 += arg1[1] * player->unk_110.unk3C[0] * 0.1;
+        *arg6 += arg1[2] * player->unk_110.unk3C[0] * 1;
         if ((player->unk_0C4 < 0) && (((player->unk_094 / 18.0f) * 216.0f) < 10.0f)) {
             func_8002A5F4(arg1, *arg3, arg2, 2.5f, 0);
         } else {
             func_8002A5F4(arg1, *arg3, arg2, 0.5f, 0);
         }
     } else if (player->unk_110.unk48[1] <= 0.5) {
-        *arg4 += arg1[0] * player->unk_110.unk3C * 1;
-        *arg5 += arg1[1] * player->unk_110.unk3C * 0.1;
-        *arg6 += arg1[2] * player->unk_110.unk3C * 1;
+        *arg4 += arg1[0] * player->unk_110.unk3C[0] * 1;
+        *arg5 += arg1[1] * player->unk_110.unk3C[0] * 0.1;
+        *arg6 += arg1[2] * player->unk_110.unk3C[0] * 1;
         func_8002A5F4(arg1, *arg3, arg2, 1, 0);
         if (((player->unk_0BC << 0xF) >= 0) && ((player->unk_0BC & 8) == 0)) {
             arg2[1] *= -1e-05;
         }
     } else {
-        *arg4 += arg1[0] * player->unk_110.unk3C * 1;
-        temp_f0_2 = arg1[1] * player->unk_110.unk3C;
+        *arg4 += arg1[0] * player->unk_110.unk3C[0] * 1;
+        temp_f0_2 = player->unk_110.unk3C[0] * arg1[1];
         if (temp_f0_2 < 0) {
             *arg5 += temp_f0_2 * 0.1;
         } else {
             *arg5 += temp_f0_2 * 0;
         }
-        *arg6 += arg1[2] * player->unk_110.unk3C * 1;
+        *arg6 += arg1[2] * player->unk_110.unk3C[0] * 1;
         func_8002A5F4(arg1, *arg3, arg2, 1.2f, 0);
         if (((player->unk_0BC << 0xF) >= 0) && ((player->unk_0BC & 8) == 0)) {
             arg2[1] *= -1e-05;
         }
     }
     player->unk_0BC &= ~0x10;
-    temp_f12 = arg1[0] * player->unk_110.unk3C;
-    temp_f14 = arg1[2] * player->unk_110.unk3C;
+    temp_f12 = player->unk_110.unk3C[0] * arg1[0];
+    temp_f14 = player->unk_110.unk3C[0] * arg1[2];
     if (((temp_f12 >= 0) && (temp_f14 >= 0)) || ((temp_f12 < 0) && (temp_f14 >= 0))) {
         temp_f0_2 = player->boundingBoxSize / 2;
         player->unk_218 = *arg4 - temp_f12 - temp_f0_2;
@@ -319,39 +319,39 @@ void func_8003FBAC(Player *player, Vec3f arg1, Vec3f arg2, Vec3f arg3, f32 *arg4
     arg1[1] = -player->unk_110.unk54[1];
     arg1[2] = -player->unk_110.unk54[2];
     if (player->unk_110.unk54[1] == 0) {
-        *arg4 += arg1[0] * player->unk_110.unk40 * 1;
-        *arg5 += arg1[1] * player->unk_110.unk40 * 0.1;
-        *arg6 += arg1[2] * player->unk_110.unk40 * 1;
+        *arg4 += arg1[0] * player->unk_110.unk3C[1] * 1;
+        *arg5 += arg1[1] * player->unk_110.unk3C[1] * 0.1;
+        *arg6 += arg1[2] * player->unk_110.unk3C[1] * 1;
         if ((player->unk_0C4 < 0) && (((player->unk_094 / 18.0f) * 216.0f) < 10.0f)) {
             func_8002A5F4(arg1, *arg3, arg2, 1.5f, 0);
         } else {
             func_8002A5F4(arg1, *arg3, arg2, 0.5f, 0);
         }
     } else if (player->unk_110.unk54[1] <= 0.5) {
-        *arg4 += arg1[0] * player->unk_110.unk40 * 1;
-        *arg5 += arg1[1] * player->unk_110.unk40 * 0.1;
-        *arg6 += arg1[2] * player->unk_110.unk40 * 1;
+        *arg4 += arg1[0] * player->unk_110.unk3C[1] * 1;
+        *arg5 += arg1[1] * player->unk_110.unk3C[1] * 0.1;
+        *arg6 += arg1[2] * player->unk_110.unk3C[1] * 1;
         func_8002A5F4(arg1, *arg3, arg2, 1, 0);
         if (((player->unk_0BC << 0xF) >= 0) && ((player->unk_0BC & 8) == 0)) {
             arg2[1] *= -1e-05;
         }
     } else {
-        *arg4 += arg1[0] * player->unk_110.unk40 * 1;
-        temp_f0_2 = arg1[1] * player->unk_110.unk40;
+        *arg4 += arg1[0] * player->unk_110.unk3C[1] * 1;
+        temp_f0_2 = player->unk_110.unk3C[1] * arg1[1];
         if (temp_f0_2 < 0) {
             *arg5 += temp_f0_2 * 0.1;
         } else {
             *arg5 += temp_f0_2 * 0;
         }
-        *arg6 += arg1[2] * player->unk_110.unk40 * 1;
+        *arg6 += arg1[2] * player->unk_110.unk3C[1] * 1;
         func_8002A5F4(arg1, *arg3, arg2, 1.2f, 0);
         if (((player->unk_0BC << 0xF) >= 0) && ((player->unk_0BC & 8) == 0)) {
             arg2[1] *= -1e-05;
         }
     }
     player->unk_0BC &= ~0x10;
-    temp_f12 = arg1[0] * player->unk_110.unk40;
-    temp_f14 = arg1[2] * player->unk_110.unk40;
+    temp_f12 = player->unk_110.unk3C[1] * arg1[0];
+    temp_f14 = player->unk_110.unk3C[1] * arg1[2];
     if (((temp_f12 >= 0) && (temp_f14 >= 0)) || ((temp_f12 >= 0) && (temp_f14 < 0))) {
         temp_f0_2 = player->boundingBoxSize / 2;
         player->unk_218 = *arg4 - temp_f12 - temp_f0_2;