From 41ed1c6bcbac8cc2f18f48df28f97bea84decffe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Jun 2020 15:44:41 -0400 Subject: Fix some warnings in waza.c --- arm9/src/waza.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/src') 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) -- cgit v1.2.3 From 92d09cdc734b522010f281206e9d06fe42ccca59 Mon Sep 17 00:00:00 2001 From: Kaz Date: Thu, 18 Jun 2020 16:47:20 -0400 Subject: Fix tab/space conundrum --- arm9/src/math_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/src') 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; -- cgit v1.2.3