diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-06-18 16:57:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 16:57:41 -0400 |
| commit | c2ca3c0c4fc49a19554c202e45a990c61752e15d (patch) | |
| tree | d7adbe4bb91cce929d5fcb1bb26d992474639afa /arm9/src | |
| parent | 593002a8f92cc7d7edd0f1555c43985ca707824d (diff) | |
| parent | f20e222730ad06a967eb1003f38f100fa81fed43 (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/math_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arm9/src/math_util.c b/arm9/src/math_util.c index 3f6bdb79..5aeb4f8e 100644 --- a/arm9/src/math_util.c +++ b/arm9/src/math_util.c @@ -397,7 +397,7 @@ THUMB_FUNC s32 CircularDistance(s32 x1, s32 y1, s32 x2, s32 y2) VEC_Subtract(&v2, &v1, &v4); f2 = VEC_DotProduct(&v3, &v4); ret = f2 >> FX32_INT_SHIFT; - ret = (ret < 0) ? -ret : ret; + ret = (ret < 0) ? -ret : ret; if (f1 <= 0) ret *= -1; |