From 21c3e7e8e5555af964f7419aa9213446eaa421d6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 2 May 2018 11:31:58 -0400
Subject: through SetMauvilleOldMan

---
 include/global.h           | 62 ++++++++++++++++++++++++++++++++--------------
 include/mauville_old_man.h |  9 +++++++
 2 files changed, 52 insertions(+), 19 deletions(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index f88203c90..d3506d345 100644
--- a/include/global.h
+++ b/include/global.h
@@ -428,28 +428,50 @@ struct MailStruct
     /*0x20*/ u16 itemId;
 };
 
-struct UnkMauvilleOldManStruct
-{
-               u8 unk_2D94;
-               u8 unk_2D95;
-    /*0x2D96*/ u16 mauvilleOldMan_ecArray[6];
-    /*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6];
-    /*0x2DAE*/ u8 playerName[8];
-    /*0x2DB6*/ u8 filler_2DB6[0x3];
-    /*0x2DB9*/ u8 playerTrainerId[4];
-               u8 unk_2DBD;
+struct MauvilleManCommon
+{
+    u8 id;
+};
+
+struct MauvilleManBard
+{
+    /*0x00*/ u8 id;
+    /*0x02*/ u16 songLyrics[6];
+    /*0x0E*/ u16 temporaryLyrics[6];
+    /*0x1A*/ u8 playerName[8];
+    /*0x22*/ u8 filler_2DB6[0x3];
+    /*0x25*/ u8 playerTrainerId[4];
+    /*0x29*/ bool8 hasChangedSong;
+    /*0x2A*/ u8 language;
 }; /*size = 0x2C*/
 
-struct UnkMauvilleOldManStruct2
+struct MauvilleManStoryteller
 {
-    u8 filler0;
-    u8 unk1;
-    u8 unk2;
-    u16 mauvilleOldMan_ecArray[10];
-    u8 mauvilleOldMan_ecArray2[12];
-    u8 fillerF[0x2];
+    u8 id;
+    bool8 alreadyRecorded;
+    u8 filler2[2];
+    u8 gameStatIDs[4];
+    u8 trainerNames[4][7];
+    u8 statValues[4][4];
+};
+
+struct MauvilleManGiddy
+{
+    /*0x00*/ u8 id;
+    /*0x01*/ u8 taleCounter;
+    /*0x02*/ u8 questionNum;
+    /*0x04*/ u16 randomWords[10];
+    /*0x18*/ u8 questionList[8];
+    /*0x20*/ u8 language;
 }; /*size = 0x2C*/
 
+struct MauvilleManHipster
+{
+    u8 id;
+    bool8 alreadySpoken;
+    u8 language;
+};
+
 struct MauvilleOldManTrader
 {
     u8 unk0;
@@ -460,8 +482,10 @@ struct MauvilleOldManTrader
 
 typedef union OldMan
 {
-    struct UnkMauvilleOldManStruct oldMan1;
-    struct UnkMauvilleOldManStruct2 oldMan2;
+    struct MauvilleManCommon common;
+    struct MauvilleManBard bard;
+    struct MauvilleManGiddy giddy;
+    struct MauvilleManHipster hipster;
     struct MauvilleOldManTrader trader;
     u8 filler[0x40];
 } OldMan;
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index aefc76083..0fc9fd6eb 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -2,6 +2,15 @@
 #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);
 
-- 
cgit v1.2.3


From cae0fb8ec277adc4a7a6a27d1bbfa5aff8c49239 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 2 May 2018 16:57:34 -0400
Subject: through sub_81203FC

---
 include/easy_chat.h     | 30 ++----------------------------
 include/event_scripts.h | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 28 deletions(-)

(limited to 'include')

diff --git a/include/easy_chat.h b/include/easy_chat.h
index e5fdc8bea..ad586d697 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1,40 +1,14 @@
 #ifndef GUARD_EASYCHAT_H
 #define GUARD_EASYCHAT_H
 
-// Taken from Pokeruby, check if it's correct
-enum
-{
-    EC_GROUP_POKEMON,
-    EC_GROUP_TRAINER,
-    EC_GROUP_STATUS,
-    EC_GROUP_BATTLE,
-    EC_GROUP_GREETINGS,
-    EC_GROUP_PEOPLE,
-    EC_GROUP_VOICES,
-    EC_GROUP_SPEECH,
-    EC_GROUP_ENDINGS,
-    EC_GROUP_FEELINGS,
-    EC_GROUP_CONDITIONS,
-    EC_GROUP_ACTIONS,
-    EC_GROUP_LIFESTYLE,
-    EC_GROUP_HOBBIES,
-    EC_GROUP_TIME,
-    EC_GROUP_MISC,
-    EC_GROUP_ADJECTIVES,
-    EC_GROUP_EVENTS,
-    EC_GROUP_MOVE_1,
-    EC_GROUP_MOVE_2,
-    EC_GROUP_TRENDY_SAYING,
-    EC_GROUP_POKEMON_2,
-};
-
 void InitEasyChatPhrases(void);
 void easy_chat_input_maybe(void);
-void CopyEasyChatWord(u8 *dest, u16 word);
+u8 * CopyEasyChatWord(u8 *dest, u16 word);
 bool32 sub_811F8D8(u16 word);
 void InitializeEasyChatWordArray(u16 *words, u16 length);
 void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
 bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
 u16 sub_811EE38(u16 group);
+u16 sub_811F01C(void);
 
 #endif // GUARD_EASYCHAT_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index eb523a487..a964b1a67 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -394,4 +394,24 @@ extern const u8 Route111_EventScript_2907F0[];
 extern const u8 LittlerootTown_BrendansHouse_2F_EventScript_1F863F[];
 extern const u8 LittlerootTown_MaysHouse_2F_EventScript_1F958F[];
 
+//mauville_old_man
+extern const u8 gOtherText_Is[];
+extern const u8 gOtherText_DontYouAgree[];
+extern const u8 gText_SoPretty[];
+extern const u8 gText_SoDarling[];
+extern const u8 gText_SoRelaxed[];
+extern const u8 gText_SoSunny[];
+extern const u8 gText_SoDesirable[];
+extern const u8 gText_SoExciting[];
+extern const u8 gText_SoAmusing[];
+extern const u8 gText_SoMagical[];
+extern const u8 gUnknown_08294313[];
+extern const u8 gUnknown_08294359[];
+extern const u8 gUnknown_08294398[];
+extern const u8 gUnknown_082943DA[];
+extern const u8 gUnknown_0829441C[];
+extern const u8 gUnknown_08294460[];
+extern const u8 gUnknown_082944A0[];
+extern const u8 gUnknown_082944D5[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
-- 
cgit v1.2.3


From 0bc7759f9b2ee1e8b442d2b7cc9da44bb146e765 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 3 May 2018 13:40:08 -0400
Subject: through sub_8120748

---
 include/bard_music.h | 4 +++-
 include/easy_chat.h  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bard_music.h b/include/bard_music.h
index 7d9ca633e..9d3d0ad22 100644
--- a/include/bard_music.h
+++ b/include/bard_music.h
@@ -9,7 +9,7 @@ struct BardSound
     /*0x00*/ u8 var00;
     /*0x01*/ s8 var01;
     /*0x02*/ u16 var02;
-    /*0x04*/ u16 volume;
+    /*0x04*/ s16 volume;
     /*0x06*/ u16 var06;
 };
 
@@ -39,5 +39,7 @@ struct BardSong
 // Exported ROM declarations
 
 extern const u16 gUnknown_085F5490;
+const struct BardSound *GetWordSounds(u16 word);
+void GetWordPhonemes(struct BardSong *song, u16 word);
 
 #endif //GUARD_BARD_MUSIC_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index ad586d697..541fa6c1b 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -10,5 +10,7 @@ void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 len
 bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
 u16 sub_811EE38(u16 group);
 u16 sub_811F01C(void);
+bool16 EasyChat_GetNumWordsInGroup(u8);
+u16 sub_811EE90(u16);
 
 #endif // GUARD_EASYCHAT_H
-- 
cgit v1.2.3


From c6115a2fec2955803e65eedf5e8de1b8a134c188 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 3 May 2018 17:03:52 -0400
Subject: through sub_8120C0C

---
 include/event_scripts.h    | 110 +++++++++++++++++++++++++++++++++++++++++++++
 include/global.h           |   3 ++
 include/mauville_old_man.h |   1 +
 include/strings.h          |   2 +
 4 files changed, 116 insertions(+)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index a964b1a67..c187682b0 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -414,4 +414,114 @@ extern const u8 gUnknown_08294460[];
 extern const u8 gUnknown_082944A0[];
 extern const u8 gUnknown_082944D5[];
 
+
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E930[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E947[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E956[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9D7[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9EF[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28E9FE[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EA7D[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EA98[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EAA8[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB19[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB31[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EB3E[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBB5[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBCD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EBDD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC60[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC79[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EC81[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED04[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED21[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28ED30[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDA1[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDB5[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EDCF[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE45[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE5D[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EE6A[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EEDD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EEF1[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF01[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF73[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EF95[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28EFAA[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F045[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F05A[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F071[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F0F3[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F10D[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F125[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1BE[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1D5[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F1DE[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F24F[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F269[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F277[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F2FC[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F314[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F32A[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3AD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3C6[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F3D2[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F44B[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F461[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F47C[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F50C[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F51B[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F538[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5BE[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5D1[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F5F2[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F678[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F694[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F6B4[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F751[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F76A[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F776[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F7F6[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F811[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F822[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F89C[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F8AF[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F8BC[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F92F[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F941[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F949[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9D1[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9EA[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28F9FD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FA81[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FA99[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FAA7[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB1D[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB35[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FB47[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBC4[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBD9[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FBEA[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC6B[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC85[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FC98[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD1D[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD35[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FD40[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDA2[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDBD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FDCE[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE57[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE72[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FE88[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF0C[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF27[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FF44[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FFDD[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_28FFFA[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_29000D[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_290097[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[];
+extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/global.h b/include/global.h
index d3506d345..083ed3e9f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -453,6 +453,7 @@ struct MauvilleManStoryteller
     u8 gameStatIDs[4];
     u8 trainerNames[4][7];
     u8 statValues[4][4];
+    u8 unk34[4];
 };
 
 struct MauvilleManGiddy
@@ -478,6 +479,7 @@ struct MauvilleOldManTrader
     u8 unk1[4];
     u8 unk5[4][11];
     u8 unk31;
+    u8 unk32[4];
 };
 
 typedef union OldMan
@@ -487,6 +489,7 @@ typedef union OldMan
     struct MauvilleManGiddy giddy;
     struct MauvilleManHipster hipster;
     struct MauvilleOldManTrader trader;
+    struct MauvilleManStoryteller storyteller;
     u8 filler[0x40];
 } OldMan;
 
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 0fc9fd6eb..28cd5589e 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -13,5 +13,6 @@ enum MauvilleOldManType
 
 void SetMauvilleOldMan(void);
 u8 sub_81201C8(void);
+extern struct BardSong gUnknown_03006130;
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
diff --git a/include/strings.h b/include/strings.h
index 7c81dbcfb..604437d32 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -429,5 +429,7 @@ extern const u8 gText_TooImportantToToss[];
 extern const u8 gText_ConfirmTossItems[];
 extern const u8 gText_MoveVar1Where[];
 
+extern const u8 gText_Friend[];
+
 
 #endif //GUARD_STRINGS_H
-- 
cgit v1.2.3


From 0231ed13ee72e0ccb06319a439c04381ace4b1ef Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 7 May 2018 16:35:29 -0400
Subject: Remaining functions in mauville_old_man

---
 include/script_menu.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/script_menu.h b/include/script_menu.h
index 717eda041..0555d0f78 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -9,5 +9,8 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
+u8 convert_pixel_width_to_tile_width(s32);
+u8 CreateWindowFromRect(u8, u8, u8, u8);
+void sub_80E2A78(u8);
 
 #endif //GUARD_SCRIPT_MENU_H
-- 
cgit v1.2.3


From 61cc1d55743715a64e793187f63d0f1f7a80b0e0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 7 May 2018 18:11:20 -0400
Subject: Rename symbols using Ruby as a reference

---
 include/global.h           | 6 +++---
 include/mauville_old_man.h | 5 +++--
 include/trader.h           | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/global.h b/include/global.h
index 083ed3e9f..0c50bf39c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -453,7 +453,7 @@ struct MauvilleManStoryteller
     u8 gameStatIDs[4];
     u8 trainerNames[4][7];
     u8 statValues[4][4];
-    u8 unk34[4];
+    u8 language[4];
 };
 
 struct MauvilleManGiddy
@@ -477,9 +477,9 @@ struct MauvilleOldManTrader
 {
     u8 unk0;
     u8 unk1[4];
-    u8 unk5[4][11];
+    u8 playerNames[4][11];
     u8 unk31;
-    u8 unk32[4];
+    u8 language[4];
 };
 
 typedef union OldMan
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 28cd5589e..696f12cc7 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -12,7 +12,8 @@ enum MauvilleOldManType
 };
 
 void SetMauvilleOldMan(void);
-u8 sub_81201C8(void);
-extern struct BardSong gUnknown_03006130;
+u8 GetCurrentMauvilleOldMan(void);
+extern struct BardSong gBardSong;
+void ScrSpecial_SetMauvilleOldManMapObjGfx(void);
 
 #endif // GUARD_MAUVILLE_OLD_MAN_H
diff --git a/include/trader.h b/include/trader.h
index 71fd1f7c2..96eb024b1 100644
--- a/include/trader.h
+++ b/include/trader.h
@@ -7,5 +7,7 @@
 
 void sub_8133DA0(u8 taskId);
 void sub_8133E1C(u8 taskId);
+void sub_81339F8(void);
+void Trader_ResetFlag(void);
 
 #endif //GUARD_TRADER_H
-- 
cgit v1.2.3