1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00

Match a few functions (#324)

* match a few functions

* run formath.sh

* minor fixes
This commit is contained in:
Random 2020-08-15 19:23:29 +02:00 committed by GitHub
parent d3b88e1b1c
commit d8d789d2a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 145 additions and 1528 deletions

View file

@ -357,7 +357,7 @@ s32 func_800CB934(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2) {
s32 ret = 0;
if ((arg2->y - arg1->x) < (arg0->y - arg0->x)) {
ret = 1;
ret |= 1;
}
if ((arg0->y - arg0->x) < (arg1->y - arg2->x)) {
@ -413,19 +413,19 @@ s32 func_800CBAE4(Vec3f* v0, Vec3f* v1, Vec3f* v2) {
s32 ret = 0;
if ((v2->x + v2->y + v2->z) < (v0->x + v0->y + v0->z)) {
ret = 0x01;
ret |= 1;
}
if ((-v1->x + v2->y + v2->z) < (-v0->x + v0->y + v0->z)) {
ret |= 0x02;
ret |= 2;
}
if ((-v1->x + v2->y - v1->z) < (-v0->x + v0->y - v0->z)) {
ret |= 0x04;
ret |= 4;
}
if ((v2->x + v2->y - v1->z) < (v0->x + v0->y - v0->z)) {
ret |= 0x08;
ret |= 8;
}
if ((v2->x - v1->y + v2->z) < (v0->x - v0->y + v0->z)) {