4 files changed, 17 insertions, 10 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h
index 50f5994f4..b97c2aaf2 100644
--- a/include/constants/easy_chat.h
+++ b/include/constants/easy_chat.h
@@ -1095,6 +1095,7 @@
 #define EC_WORD_OLD            (EC_GROUP_TRENDY_SAYING << 9) | 0x1e
 #define EC_WORD_YOUNG          (EC_GROUP_TRENDY_SAYING << 9) | 0x1f
 #define EC_WORD_UGLY           (EC_GROUP_TRENDY_SAYING << 9) | 0x20
+#define NUM_ADDITIONAL_PHRASES  33
 
 #define EC_POKEMON(mon) ((EC_GROUP_POKEMON << 9) | SPECIES_##mon)
 #define EC_POKEMON2(mon) ((EC_GROUP_POKEMON_2 << 9) | SPECIES_##mon)
diff --git a/include/constants/global.h b/include/constants/global.h
index 091f735f4..ca48c1d2a 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -67,6 +67,10 @@
 #define FEMALE 1
 #define GENDER_COUNT 2
 
+#define BARD_SONG_LENGTH       6
+#define NUM_STORYTELLER_TALES  4
+#define NUM_TRADER_ITEMS       4
+
 #define OPTIONS_BUTTON_MODE_NORMAL 0
 #define OPTIONS_BUTTON_MODE_LR 1
 #define OPTIONS_BUTTON_MODE_L_EQUALS_A 2
diff --git a/include/constants/mauville_man.h b/include/constants/mauville_man.h
deleted file mode 100644
index b00e3a291..000000000
--- a/include/constants/mauville_man.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAUVILLE_MAN_H
-#define GUARD_CONSTANTS_MAUVILLE_MAN_H
-
-#define MAUVILLE_MAN_BARD 0
-#define MAUVILLE_MAN_HIPSTER 1
-#define MAUVILLE_MAN_TRADER 2
-#define MAUVILLE_MAN_STORYTELLER 3
-#define MAUVILLE_MAN_GIDDY 4
-
-#endif  // GUARD_CONSTANTS_MAUVILLE_MAN_H
diff --git a/include/constants/mauville_old_man.h b/include/constants/mauville_old_man.h
new file mode 100644
index 000000000..c1fb0bf24
--- /dev/null
+++ b/include/constants/mauville_old_man.h
@@ -0,0 +1,12 @@
+#ifndef GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H
+#define GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H
+
+#define MAUVILLE_MAN_BARD           0
+#define MAUVILLE_MAN_HIPSTER        1
+#define MAUVILLE_MAN_TRADER         2
+#define MAUVILLE_MAN_STORYTELLER    3
+#define MAUVILLE_MAN_GIDDY          4
+#define MAUVILLE_MAN_UNUSED1        5
+#define MAUVILLE_MAN_UNUSED2        6
+
+#endif // GUARD_CONSTANTS_MAUVILLE_OLD_MAN_H