summaryrefslogtreecommitdiff
path: root/include/pokeball.h
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-06-21 12:43:59 -0400
committerscnorton <scnorton@biociphers.org>2017-06-21 12:43:59 -0400
commit99f9d40be14633630503ebcd75787fc7fdfe1486 (patch)
treec3962867c76bca0f06311bc39791aa42889e877d /include/pokeball.h
parent294cbd8beb08b14a24385a78f1a8435f5fbe2f8c (diff)
parent42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff)
Merge remote-tracking branch 'origin/master' into field_specials
Diffstat (limited to 'include/pokeball.h')
-rw-r--r--include/pokeball.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/pokeball.h b/include/pokeball.h
index b6fbbcf77..19f813415 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -1,7 +1,11 @@
#ifndef GUARD_POKEBALL_H
#define GUARD_POKEBALL_H
-void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s4);
+extern const struct SpriteTemplate gBallSpriteTemplates[];
+
+void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u32 s4);
void sub_804777C(u8);
+void sub_80478DC(u8);
+void sub_804794C(u8);
#endif // GUARD_POKEBALL_H