diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-05-10 03:34:36 -0400 |
| commit | 13efa1ef62b3e23e2b0662e318ed155893e17e88 (patch) | |
| tree | 57ae51e1b35c38d24d69e090dbf39b27a687d17b /include/mauville_old_man.h | |
| parent | d31600e70e53fb252fe67e8c427ecb7498719b86 (diff) | |
| parent | 7defc27b994069715e5749245700d20dd740e4f0 (diff) | |
fixing conflicts
Diffstat (limited to 'include/mauville_old_man.h')
| -rw-r--r-- | include/mauville_old_man.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h index aefc76083..696f12cc7 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_old_man.h @@ -2,7 +2,18 @@ #ifndef GUARD_MAUVILLE_OLD_MAN_H #define GUARD_MAUVILLE_OLD_MAN_H +enum MauvilleOldManType +{ + MAUVILLE_MAN_BARD, + MAUVILLE_MAN_HIPSTER, + MAUVILLE_MAN_TRADER, + MAUVILLE_MAN_STORYTELLER, + MAUVILLE_MAN_GIDDY +}; + void SetMauvilleOldMan(void); -u8 sub_81201C8(void); +u8 GetCurrentMauvilleOldMan(void); +extern struct BardSong gBardSong; +void ScrSpecial_SetMauvilleOldManMapObjGfx(void); #endif // GUARD_MAUVILLE_OLD_MAN_H |