diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-19 00:02:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 00:02:47 +0300 |
| commit | 41317a2b7625919ebba39c06b5aaf9e3b0800b1d (patch) | |
| tree | 1780ce6f8ee57a163b95beaa99e45e6aed776346 /arm9/src | |
| parent | e3077928198b2f51854812bcd04e1ebe1e6112f5 (diff) | |
| parent | a455bac566535ec559aac9164e05781093653057 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9/src')
| -rw-r--r-- | arm9/src/math_util.c | 2 | ||||
| -rw-r--r-- | arm9/src/waza.c | 4 |
2 files changed, 3 insertions, 3 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; diff --git a/arm9/src/waza.c b/arm9/src/waza.c index 1ed8574e..4b505482 100644 --- a/arm9/src/waza.c +++ b/arm9/src/waza.c @@ -27,8 +27,8 @@ u8 WazaGetMaxPp(u16 waza, u8 ppUp) u8 pp; if (ppUp > 3) ppUp = 3; - pp = GetWazaAttr(waza, 5); - return pp + (pp * 20 * ppUp) / 100; + pp = (u8)GetWazaAttr(waza, 5); + return (u8)(pp + (pp * 20 * ppUp) / 100); } u32 GetAttrFromWazaTbl(struct WazaTbl * wazaTbl, u32 attr) |