mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 23:14:37 +00:00
Code Issues Projects Releases Wiki Activity

En_Ba OK (#700)

Browse source 
* 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
This commit is contained in:
AdamKiddle 2021-02-15 22:59:59 +00:00 • committed by GitHub
parent 2c56a6e99a
commit 56e94e1e34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 516 additions and 2145 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_actor.c
View file

@ -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);
}
/**