Merge branch 'master' into trade

This commit is contained in:
PikalaxALT committed 2019-10-14 10:46:04 -04:00
commit b8fec3d9f6
145 files changed
+17677 -37125

No files matched your search

+1
View File
@@ -18,5 +18,6 @@ void sub_8097070(struct Sprite *);
u16 GetUnownLetterByPersonality(u32 personality);
void sub_809718C(void);
u8 CreateMonIcon(u16 species, void (*callback)(void), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
u8 UpdateMonIconFrame(struct Sprite *sprite);
#endif // GUARD_POKEMON_ICON_H