diff options
| author | AdamKiddle <54328813+AdamKiddle@users.noreply.github.com> | 2021-02-15 22:59:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 17:59:59 -0500 |
| commit | 56e94e1e3414e1c022d32c606b4a9592fdf4c635 (patch) | |
| tree | cf216efaae4a22f9453e554a16f4f72e08bfea8f /src/code | |
| parent | 2c56a6e99a8c6eb7be07ead7b70ac65ce123b76c (diff) | |
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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } /** |