From bfc4b338cbd3e78062c71ff6f72f821631277c1b Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Tue, 22 Aug 2017 17:34:42 -0500
Subject: rename some mauville man stuff

---
 include/mauville_old_man.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'include/mauville_old_man.h')

diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 473fcf5c8..2fd467029 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -1,11 +1,21 @@
 #ifndef GUARD_MAUVILLE_OLD_MAN_H
 #define GUARD_MAUVILLE_OLD_MAN_H
 
-void SetMauvilleOldMan(void);
+// IDs
+enum
+{
+    MAUVILLE_MAN_BARD,
+    MAUVILLE_MAN_HIPSTER,
+    MAUVILLE_MAN_TRADER,
+    MAUVILLE_MAN_STORYTELLER,
+    MAUVILLE_MAN_GIDDY,
+};
+
+void SetupMauvilleOldMan(void);
 void sub_80F7DC0(void);
 void sub_80F7F30(void);
 void sub_80F7F80(u8);
 void sub_80F83D0(void);
-void sub_80F83F8(void);
+void StorytellerSetup(void);
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
-- 
cgit v1.2.3


From a277e60789d9ea78fe03a4bcded2edf7b91e548e Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 24 Aug 2017 13:40:03 -0500
Subject: finish decompiling mauville_old_man

---
 include/mauville_old_man.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/mauville_old_man.h')

diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 2fd467029..43bf3e093 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -16,6 +16,5 @@ void sub_80F7DC0(void);
 void sub_80F7F30(void);
 void sub_80F7F80(u8);
 void sub_80F83D0(void);
-void StorytellerSetup(void);
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
-- 
cgit v1.2.3


From 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 24 Aug 2017 15:19:55 -0500
Subject: do some renaming and reorganizing

---
 include/mauville_old_man.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/mauville_old_man.h')

diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 43bf3e093..277e5fbe6 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -14,7 +14,6 @@ enum
 void SetupMauvilleOldMan(void);
 void sub_80F7DC0(void);
 void sub_80F7F30(void);
-void sub_80F7F80(u8);
 void sub_80F83D0(void);
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
-- 
cgit v1.2.3


From b6ea4d9a77cdb6b416d3dd94eef68ce8a56cd4eb Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Thu, 24 Aug 2017 21:18:07 -0500
Subject: label more stuff in mauville_old_man.c

---
 include/mauville_old_man.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/mauville_old_man.h')

diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 277e5fbe6..2b8f139f2 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -12,7 +12,6 @@ enum
 };
 
 void SetupMauvilleOldMan(void);
-void sub_80F7DC0(void);
 void sub_80F7F30(void);
 void sub_80F83D0(void);
 
-- 
cgit v1.2.3


From 3e68cbc51f867e507644c1c19bb3be7a89fcd3e4 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 8 Sep 2017 22:02:20 -0500
Subject: mauville_old_man -> mauville_man

---
 include/mauville_old_man.h | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 include/mauville_old_man.h

(limited to 'include/mauville_old_man.h')

diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
deleted file mode 100644
index 2b8f139f2..000000000
--- a/include/mauville_old_man.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#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,
-};
-
-void SetupMauvilleOldMan(void);
-void sub_80F7F30(void);
-void sub_80F83D0(void);
-
-#endif // GUARD_MAUVILLE_OLD_MAN_H
-- 
cgit v1.2.3