diff options
author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
---|---|---|
committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
tree | bd8b133710c813b11becf602067495526c849b6a /include/battle_anim_813F0F4.h | |
parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) |
merge conflicts are soooooooooo fun
Diffstat (limited to 'include/battle_anim_813F0F4.h')
-rw-r--r-- | include/battle_anim_813F0F4.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/battle_anim_813F0F4.h b/include/battle_anim_813F0F4.h index 230a04dbb..9916f2fe6 100644 --- a/include/battle_anim_813F0F4.h +++ b/include/battle_anim_813F0F4.h @@ -1,6 +1,9 @@ #ifndef GUARD_BATTLE_ANIM_813F0F4_H #define GUARD_BATTLE_ANIM_813F0F4_H -void sub_8141828(); +void sub_8141828(u8, struct Pokemon *); +u8 ball_number_to_ball_processing_index(u16); +u8 sub_814086C(u8, u8, u8, u8, u8); +u8 sub_8141314(u8, u8, u32, u8); #endif // GUARD_BATTLE_ANIM_813F0F4_H |