summaryrefslogtreecommitdiff
path: root/include/pokeball.h
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-01-09 16:48:01 -0500
committergolem galvanize <golemgalvanize@github.com>2018-01-09 16:48:01 -0500
commitc7722a492017dbd8a5fb3bb216062eb62129daf5 (patch)
tree2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/pokeball.h
parent2d141bc612ffecc984f6b4238c2791ba8419a192 (diff)
parent85174ad6193d3d58b92deaaedf8c510440ed85ee (diff)
fixing merge conflicts
Diffstat (limited to 'include/pokeball.h')
-rw-r--r--include/pokeball.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/pokeball.h b/include/pokeball.h
index 19f813415..0a709c869 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -7,5 +7,6 @@ void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u32 s
void sub_804777C(u8);
void sub_80478DC(u8);
void sub_804794C(u8);
+u8 sub_8047580(u8, u8, u8, u8, u8, u8, u8, u32);
#endif // GUARD_POKEBALL_H