diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-15 23:27:27 +0200 |
commit | 003a8a501b7ee0a4f8bf8bb803cf7e077d52d068 (patch) | |
tree | 2ebb9f702f863ab0cfb78a996aeeac331428ba7b /include/rom6.h | |
parent | 9d4acb9635b3b74d5ae4edee70d673f49c0aab74 (diff) | |
parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) |
fix merge conflict
Diffstat (limited to 'include/rom6.h')
-rw-r--r-- | include/rom6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rom6.h b/include/rom6.h index 15070616d..0e9927855 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -2,5 +2,6 @@ #define GUARD_ROM6_H void sub_81357FC(u8, void(void)); +u8 GetLeadMonIndex(void); #endif //GUARD_ROM6_H |