Merge branch 'master' into z_en_tk

1 files changed, 3 insertions, 14 deletions

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index ba79db4ae..3eb05efb4 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -88,7 +88,7 @@ void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3,
     gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0,
                     (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF);
 
-    sp58 = func_800FD250(light->l.dir[0], light->l.dir[2]);
+    sp58 = Math_atan2f(light->l.dir[0], light->l.dir[2]);
     arg6 *= (4.5f - (light->l.dir[1] * 0.035f));
     arg6 = (arg6 < 1.0f) ? 1.0f : arg6;
     Matrix_Put(arg2);
@@ -4341,17 +4341,6 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3)
     return arg2;
 }
 
-// Some animation related structure
-typedef struct
-{
-    /* 0x00 */ u32      animation;
-    /* 0x04 */ f32      playbackSpeed;
-    /* 0x08 */ f32      unk_08;
-    /* 0x0C */ f32      frameCount;
-    /* 0x10 */ u8       unk_10;
-    /* 0x14 */ f32      transitionRate;
-} struct_80034EC0_Entry; // size = 0x18
-
 void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2)
 {
     f32 frameCount;
@@ -4696,12 +4685,12 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2)
         sp38 = Math_Sins(arg1);
         sp34 = Math_Coss(arg1);
         sp28 = (-(sp44 * sp38) - (sp3C * sp34));
-        arg2->x = -(s16)(func_800FD250(sp28 * sp40, 1.0f) * (32768 / M_PI));
+        arg2->x = -(s16)(Math_atan2f(sp28 * sp40, 1.0f) * (32768 / M_PI));
 
         sp2C = Math_Sins(arg1 - 16375);
         sp30 = Math_Coss(arg1 - 16375);
         sp24 = (-(sp44 * sp2C) - (sp3C * sp30));
-        arg2->z = -(s16)(func_800FD250(sp24 * sp40, 1.0f) * (32768 / M_PI));
+        arg2->z = -(s16)(Math_atan2f(sp24 * sp40, 1.0f) * (32768 / M_PI));
     }
 }