diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:00:47 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-03 18:14:15 -0700 |
commit | 415fb6738308a9bfa2217419d3861784dcd8e5d9 (patch) | |
tree | 8793240342d37104610f34756f6fee9db706ee8f /include/pokemon_icon.h | |
parent | ae56f7859fe17915d3fb33713dfef2fe31fe2a1d (diff) | |
parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'include/pokemon_icon.h')
-rw-r--r-- | include/pokemon_icon.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 98f984564..7e26c1c9b 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -1,7 +1,8 @@ #ifndef GUARD_POKEMON_ICON_H #define GUARD_POKEMON_ICON_H -u8 CreateMonIcon(); +u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality); +u8 UpdateMonIconFrame(struct Sprite *sprite); u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4); u16 GetUnownLetterByPersonality(u32); u16 sub_809D4A8(u16); @@ -9,6 +10,7 @@ void sub_809D510(struct Sprite *); void sub_809D51C(void); void sub_809D580(u16); void sub_809D608(u16); -void UpdateMonIconFrame(struct Sprite *sprite); +void sub_809D62C(struct Sprite *sprite); +void sub_809D824(struct Sprite *sprite, u8 animNum); #endif // GUARD_POKEMON_ICON_H |