summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-06-19 00:02:21 +0300
committerGitHub <noreply@github.com>2020-06-19 00:02:21 +0300
commita455bac566535ec559aac9164e05781093653057 (patch)
treed7adbe4bb91cce929d5fcb1bb26d992474639afa /arm9/src
parentf20e222730ad06a967eb1003f38f100fa81fed43 (diff)
parentc2ca3c0c4fc49a19554c202e45a990c61752e15d (diff)
Merge pull request #171 from PikalaxALT/pikalax_work
KNARC: Add handling of .knarcignore, .knarckeep; fix up cli; implement o2narc for poketool/personal/*.narc
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/waza.c4
1 files changed, 2 insertions, 2 deletions
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)