diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /include/mauville_man.h | |
parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) |
Merge branch 'master' into cable_car
Diffstat (limited to 'include/mauville_man.h')
-rw-r--r-- | include/mauville_man.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/mauville_man.h b/include/mauville_man.h index 2b8f139f2..622cd1bfb 100644 --- a/include/mauville_man.h +++ b/include/mauville_man.h @@ -1,15 +1,7 @@ #ifndef GUARD_MAUVILLE_OLD_MAN_H #define GUARD_MAUVILLE_OLD_MAN_H -// IDs -enum -{ - MAUVILLE_MAN_BARD, - MAUVILLE_MAN_HIPSTER, - MAUVILLE_MAN_TRADER, - MAUVILLE_MAN_STORYTELLER, - MAUVILLE_MAN_GIDDY, -}; +#include "constants/mauville_man.h" void SetupMauvilleOldMan(void); void sub_80F7F30(void); |