diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 15:39:21 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 16:03:06 -0500 |
| commit | f2763832931127fc24e7cb9f9cdd85e3cf706a5c (patch) | |
| tree | d23050509231d1d9c6d1694b2755c93fdaf26a4e /include/battle_interface.h | |
| parent | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff) | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
Merge master into sync-script
Diffstat (limited to 'include/battle_interface.h')
| -rw-r--r-- | include/battle_interface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_interface.h b/include/battle_interface.h index 162faa8cb..01f3c4b29 100644 --- a/include/battle_interface.h +++ b/include/battle_interface.h @@ -79,8 +79,8 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem s32 sub_8074AA0(u8 bank, u8 healthboxSpriteId, u8 whichBar, u8 arg3); u8 GetScaledHPFraction(s16 hp, s16 maxhp, u8 scale); u8 GetHPBarLevel(s16 hp, s16 maxhp); -void sub_80496C0(u8 spriteId, struct Pokemon *mon); -void sub_804981C(u8 spriteId, u8); +void UpdateNickInHealthbox(u8 spriteId, struct Pokemon *mon); +void TryAddPokeballIconToHealthbox(u8 spriteId, u8); s32 MoveBattleBar(u8 battler, u8 healthboxSpriteId, u8 whichBar, u8 arg3); #endif // GUARD_BATTLE_INTERFACE_H |