diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/battle_anim_80CA710.h | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/battle_anim_80CA710.h')
| -rw-r--r-- | include/battle_anim_80CA710.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/battle_anim_80CA710.h b/include/battle_anim_80CA710.h index fbbe23b97..14a6ca898 100644 --- a/include/battle_anim_80CA710.h +++ b/include/battle_anim_80CA710.h @@ -2,5 +2,7 @@ #define GUARD_BATTLE_ANIM_80CA710_H void sub_80E4EF8(int, int, int, int, u16, u8, int); +s16 sub_81174E0(s16 a); +s16 sub_81174C4(s16 a, s16 b); #endif // GUARD_BATTLE_ANIM_80CA710_H |