diff options
author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
---|---|---|
committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-18 19:28:36 -0400 |
commit | d4532c70cb03962d38517fef2d723f81a9b27c1b (patch) | |
tree | 70220c06025360d7089011f5d80239b61ac183af /include/rom6.h | |
parent | 11f9a27640a9f921c6dc1858261d9a609a6599ca (diff) | |
parent | 0f0ba1e28c5c14bb93d403fd2df4a2d89e057a65 (diff) |
fix merge conflicts
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 |