diff options
| author | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-10-16 14:12:59 -0400 |
| commit | a6d2bfaebd16940fc0ac1be3ca29caf0888296ca (patch) | |
| tree | 7ec979bc8481b2c2d55874aef3e9004ddb715781 /include/battle_interface.h | |
| parent | 96ebc5d46287e33df7bda74a6fb340281cdaa4c5 (diff) | |
| parent | 7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (diff) | |
Merge branch 'master' into secret_base
Diffstat (limited to 'include/battle_interface.h')
| -rw-r--r-- | include/battle_interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_interface.h b/include/battle_interface.h index 8230c7502..db41ee735 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -29,7 +29,7 @@ u8 sub_8044804(u8, const struct BattleInterfaceStruct2 *, u8, u8); void sub_8044CA0(u8); void sub_8045A5C(u8, struct Pokemon *, u8); s32 sub_8045C78(u8, u8, u8, u8); -s16 sub_80460C8(struct BattleInterfaceStruct1 *, int *, void *, int); +s16 sub_80460C8(struct BattleInterfaceStruct1 *, int *, u16 *, int); u8 GetScaledHPFraction(s16, s16, u8); u8 GetHPBarLevel(s16, s16); void sub_80440EC(u8 a, s16 b, u8 c); |