merge master

1 files changed, 12 insertions, 23 deletions

diff --git a/src/code/code_8007BF90.c b/src/code/code_8007BF90.c
index a7e1cca5b..c51b222f9 100644
--- a/src/code/code_8007BF90.c
+++ b/src/code/code_8007BF90.c
@@ -3,8 +3,7 @@
 
 Vec3f* func_8007C1AC(Vec3f* dest, struct_80045714* arg1);
 
-f32 func_8007BF90(Vec3f* a, Vec3f* b)
-{
+f32 func_8007BF90(Vec3f* a, Vec3f* b) {
     f32 dx = a->x - b->x;
     f32 dy = a->y - b->y;
     f32 dz = a->z - b->z;
@@ -12,8 +11,7 @@ f32 func_8007BF90(Vec3f* a, Vec3f* b)
     return sqrtf(SQ(dx) + SQ(dy) + SQ(dz));
 }
 
-f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest)
-{
+f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) {
     dest->x = a->x - b->x;
     dest->y = a->y - b->y;
     dest->z = a->z - b->z;
@@ -21,20 +19,17 @@ f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest)
     return sqrtf(SQ(dest->x) + SQ(dest->y) + SQ(dest->z));
 }
 
-f32 func_8007C028(Vec3f* a, Vec3f* b)
-{
+f32 func_8007C028(Vec3f* a, Vec3f* b) {
     return sqrtf(SQ(a->x - b->x) + SQ(a->z - b->z));
 }
 
-f32 func_8007C058(f32 arg0, f32 arg1)
-{
+f32 func_8007C058(f32 arg0, f32 arg1) {
     return (arg1 <= fabsf(arg0)) ? arg0 : ((arg0 >= 0) ? arg1 : -arg1);
 }
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C0A8.s")
 
-Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b)
-{
+Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) {
     Vec3f v1;
     Vec3f v2;
     f32 temp;
@@ -54,8 +49,7 @@ Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b)
     return dest;
 }
 
-Vec3f* func_8007C1AC(Vec3f* dest, struct_80045714* arg1)
-{
+Vec3f* func_8007C1AC(Vec3f* dest, struct_80045714* arg1) {
     Vec3f v;
     f32 sin4;
     f32 cos4;
@@ -78,8 +72,7 @@ Vec3f* func_8007C1AC(Vec3f* dest, struct_80045714* arg1)
 
 void func_8007C3F4(struct_80045714* arg0, Vec3f* arg1);
 
-void func_8007C25C(Vec3f* dest, struct_80045714* arg1)
-{
+void func_8007C25C(Vec3f* dest, struct_80045714* arg1) {
     struct_80045714 var;
 
     var.unk_00 = arg1->unk_00;
@@ -95,8 +88,7 @@ void func_8007C25C(Vec3f* dest, struct_80045714* arg1)
 
 void func_8007C29C(struct_80045714* arg0, Vec3f* arg1);
 
-void func_8007C440(struct_80045714* arg0, Vec3f* a, Vec3f* b)
-{
+void func_8007C440(struct_80045714* arg0, Vec3f* a, Vec3f* b) {
     Vec3f var;
 
     var.x = b->x - a->x;
@@ -106,8 +98,7 @@ void func_8007C440(struct_80045714* arg0, Vec3f* a, Vec3f* b)
     func_8007C29C(arg0, &var);
 }
 
-void func_8007C490(struct_80045714* arg0, Vec3f* a, Vec3f* b)
-{
+void func_8007C490(struct_80045714* arg0, Vec3f* a, Vec3f* b) {
     Vec3f var;
 
     var.x = b->x - a->x;
@@ -117,12 +108,11 @@ void func_8007C490(struct_80045714* arg0, Vec3f* a, Vec3f* b)
     func_8007C3F4(arg0, &var);
 }
 
-Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b)
-{
+Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b) {
     Vec3f var;
 
-    var.x = func_800FD250(b->z - a->z, b->y - a->y);
-    var.y = func_800FD250(b->x - a->x, b->z - a->z);
+    var.x = Math_atan2f(b->z - a->z, b->y - a->y);
+    var.y = Math_atan2f(b->x - a->x, b->z - a->z);
     var.z = 0;
 
     *dest = var;
@@ -133,4 +123,3 @@ Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b)
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C574.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C5E0.s")
-