diff options
author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/battle_interface.h | |
parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) |
fix merge conflicts
Diffstat (limited to 'include/battle_interface.h')
-rw-r--r-- | include/battle_interface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/battle_interface.h b/include/battle_interface.h index 70434f9a9..8230c7502 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -32,5 +32,6 @@ s32 sub_8045C78(u8, u8, u8, u8); s16 sub_80460C8(struct BattleInterfaceStruct1 *, int *, void *, int); u8 GetScaledHPFraction(s16, s16, u8); u8 GetHPBarLevel(s16, s16); +void sub_80440EC(u8 a, s16 b, u8 c); #endif // GUARD_BATTLE_INTERFACE_H |