summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2019-04-10 12:11:36 -0400
committerscnorton <scnorton@biociphers.org>2019-04-10 12:11:36 -0400
commit2f337edf36ded496efd8ec6cc0c35dda10e1bc98 (patch)
treeb6b303c4cf286c79d2a8e6792fe5c2bd0036b13b /include
parentdfc2fa2b393437a471bf815f2c9a7be0bc061021 (diff)
through sub_812FD78
Diffstat (limited to 'include')
-rw-r--r--include/menu.h1
-rw-r--r--include/pokeball.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/menu.h b/include/menu.h
index b134ef7f5..cdc872a6d 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -42,5 +42,6 @@ void sub_810F558(u8, u8, u8, u8, u16);
void sub_810F650(const u8 *, const u8 *, u8, u32, u8);
void sub_810F5E8(const u8 *, u32, u8);
void sub_810F71C(void);
+void sub_810F740(void);
#endif // GUARD_MENU_H
diff --git a/include/pokeball.h b/include/pokeball.h
index 10a9529b9..5545f8870 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -24,7 +24,8 @@ enum
#define POKEBALL_OPPONENT_SENDOUT 0xFE
u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
-void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species);
+void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
+u8 sub_804BB98(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h);
void sub_8076918(u8 bank);
void DoHitAnimHealthboxEffect(u8 bank);