diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 15:42:40 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 16:06:44 -0800 |
| commit | 267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch) | |
| tree | 559417726bbd5f3b18c153c1435f872decfe18b1 /include/pokeball.h | |
| parent | 20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff) | |
| parent | 67ad331441f29545b84d152cbbb4f188098a9c5a (diff) | |
Merge remote-tracking branch 'upstream/master' into 80c
Diffstat (limited to 'include/pokeball.h')
| -rw-r--r-- | include/pokeball.h | 1 |
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 |