From 56e94e1e3414e1c022d32c606b4a9592fdf4c635 Mon Sep 17 00:00:00 2001
From: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Date: Mon, 15 Feb 2021 22:59:59 +0000
Subject: En_Ba OK (#700)

* init done

* Everything done except for draw

* matching

* Tidied for pr

* merge master into en_ba

* run format.sh

* fixing merge mistakes

* how many different ways can I screw up a merge challenge

* some pr comments
---
 src/code/z_actor.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 08a17b6ad..d46cc5ceb 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -4079,13 +4079,13 @@ void func_8003573C(Actor* actor, ColliderJntSph* jntSph, s32 freezeFlag) {
     }
 }
 
-void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) {
+void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3) {
     f32 dx = arg1->x - arg0->x;
     f32 dz = arg1->z - arg0->z;
     f32 dy = arg3 ? (arg1->y - arg0->y) : (arg0->y - arg1->y);
 
-    arg2[1] = Math_Atan2S(dz, dx);
-    arg2[0] = Math_Atan2S(sqrtf(SQ(dx) + SQ(dz)), dy);
+    arg2->y = Math_Atan2S(dz, dx);
+    arg2->x = Math_Atan2S(sqrtf(SQ(dx) + SQ(dz)), dy);
 }
 
 /**
-- 
cgit v1.2.3