Merge branch 'master' into field_map_obj

2017-09-13 19:29:19 -04:00
parent c2e31f0618 78009a835f
commit 64ffa8f963
221 changed files with 152332 additions and 152431 deletions
@@ -1,10 +1,8 @@
-//
-// Created by Scott Norton on 9/8/17.
-//

-#ifndef POKEEMERALD_MAUVILLE_OLD_MAN_H
-#define POKEEMERALD_MAUVILLE_OLD_MAN_H
+#ifndef GUARD_MAUVILLE_OLD_MAN_H
+#define GUARD_MAUVILLE_OLD_MAN_H

+void SetMauvilleOldMan(void);
 u8 sub_81201C8(void);

-#endif //POKEEMERALD_MAUVILLE_OLD_MAN_H
+#endif // GUARD_MAUVILLE_OLD_MAN_H