diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-08 17:25:26 -0600 |
| commit | fc11078cef11edc9deedd08c6175fb5e6628504c (patch) | |
| tree | 62823b5dc1335a4d8659104dc4156713674ce757 /include/pokeball.h | |
| parent | ba06c424c974f18f9c4af85eb0ffe8adc6056941 (diff) | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
fix merge conflicts
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 |