Merge pull request #417 from camthesaxman/decompile_mauville_old_man

finish decompiling mauville_old_man

12 files changed, 1392 insertions, 355 deletions

diff --git a/src/bard_music.c b/src/bard_music.c
index a31568475..daf003233 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,71 +1,43 @@
 #include "global.h"
+#include "bard_music.h"
 #include "easy_chat.h"
 
 struct BardSound
 {
-    u8 pad_00[48];
-};
-
-struct UnkBard
-{
     /*0x00*/ u8 var00;
     /*0x01*/ s8 var01;
     /*0x02*/ u16 var02;
-    /*0x04*/ u16 var04;
+    /*0x04*/ u16 volume;
     /*0x06*/ u16 var06;
 };
 
-struct UnkBard3
-{
-    /*0x00*/ u16 var00;
-    /*0x02*/ u16 var02;
-    /*0x04*/ s16 var04;
-    /*0x06*/ u16 var06;
-};
-
-struct UnkBard2
-{
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    /*0x02*/ u8 var02;
-    /*0x03*/ u8 var03;
-    /*0x04*/ u16 var04;
-             u8 pad06[4];
-    /*0x0A*/ u16 var0A;
-             u8 pad0C[12];
-    /*0x18*/ struct UnkBard3 var18[6];
-};
-
-extern struct BardSound *gBardMusicTable[];
+extern const struct BardSound (*const gBardMusicTable[])[][6];
 extern s16 *gUnknown_08417068[];
 extern u32 gUnknown_084170F4[];
 
-static s16 sub_814A2B8(u32 arg0, u32 arg1)
+static s16 CalcWordPitch(u32 arg0, u32 songPos)
 {
-    return gUnknown_08417068[arg0][arg1];
+    return gUnknown_08417068[arg0][songPos];
 }
 
 #if ENGLISH
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+const struct BardSound *GetWordSounds(u16 group, u16 word)
 {
-    struct BardSound *sounds = gBardMusicTable[arg0];
+    const struct BardSound (*sounds)[][6] = gBardMusicTable[group];
 
-    return &sounds[arg1];
+    return (*sounds)[word];
 }
 #elif GERMAN
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+const struct BardSound *GetWordSounds(u16 group, u16 word)
 {
-    u32 index;
-    struct BardSound *sounds;
-
-    sounds = gBardMusicTable[arg0];
-    index = de_sub_80EB748(arg0, arg1);
+    const struct BardSound (*sounds)[][6] = gBardMusicTable[group];
+    u32 index = de_sub_80EB748(group, word);
 
-    return &sounds[index];
+    return (*sounds)[index];
 }
 #endif
 
-s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
+s32 GetWordPhonemes(struct BardSong *song, const struct BardSound *src, u16 arg2)
 {
     s32 i;
     s32 j;
@@ -73,25 +45,25 @@ s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
 
     for (i = 0; i < 6; i++)
     {
-        dest->var18[i].var00 = src[i].var00;
+        song->phonemes[i].sound = src[i].var00;
         if (src[i].var00 != 0xFF)
         {
-            s32 r1 = src[i].var01 +gUnknown_084170F4[src[i].var00];
+            s32 length = src[i].var01 + gUnknown_084170F4[src[i].var00];
 
-            dest->var18[i].var02 = r1;
-            dest->var18[i].var06 = src[i].var04;
-            dest->var04 += r1;
+            song->phonemes[i].length = length;
+            song->phonemes[i].volume = src[i].volume;
+            song->var04 += length;
         }
     }
 
     for (j = 0, thirty = 30; j < i; j++)
-        dest->var18[j].var04 = sub_814A2B8(thirty + arg2, j);
+        song->phonemes[j].pitch = CalcWordPitch(thirty + arg2, j);
 
-    dest->var00++;
-    dest->var01 = 0;
-    dest->var02 = 0;
-    dest->var03 = 0;
-    dest->var0A = 0;
+    song->currWord++;
+    song->currPhoneme = 0;
+    song->phonemeTimer = 0;
+    song->state = 0;
+    song->voiceInflection = 0;
 
     //warning: no return statement in function returning non-void
 }
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 214e4ef64..dd33e69c3 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -19,8 +19,8 @@ extern const u8 gEasyChatGroupSizes[];
 
 extern u16 gSpecialVar_0x8004;
 
-
-u8 *sub_80EB3FC(u8 *dst, u16 word)
+// returns the end of the destination buffer text
+u8 *EasyChat_GetWordText(u8 *dst, u16 word)
 {
     u16 group;
     u16 wordIndex;
@@ -32,13 +32,13 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
 
     if (word == 0xFFFF)
     {
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
     else
     {
-        group = word >> 9;
-        wordIndex = word & 0x1FF;
+        group = EC_GROUP(word);
+        wordIndex = EC_INDEX(word);
         switch (group)
         {
         case EC_GROUP_POKEMON: // 0
@@ -59,7 +59,7 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
             dst = StringCopy(dst, src);
             break;
         }
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
 }
@@ -77,7 +77,7 @@ u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         for (n = 0; n < i1; n++)
         {
-            dst = sub_80EB3FC(dst, words[0]);
+            dst = EasyChat_GetWordText(dst, words[0]);
 
             if (words[0] != 0xFFFF)
             {
@@ -90,7 +90,7 @@ u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         word = words[0];
         words++;
-        dst = sub_80EB3FC(dst, word);
+        dst = EasyChat_GetWordText(dst, word);
 
         dst[0] = CHAR_NEWLINE;
         dst++;
@@ -115,7 +115,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         for (n = 0; n < i1; n++)
         {
-            dst = sub_80EB3FC(dst, words[0]);
+            dst = EasyChat_GetWordText(dst, words[0]);
 
             if (words[0] != 0xFFFF)
             {
@@ -128,7 +128,7 @@ u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3)
 
         word = words[0];
         words++;
-        dst = sub_80EB3FC(dst, word);
+        dst = EasyChat_GetWordText(dst, word);
 
         // Only difference with ConvertEasyChatWordsToString
         dst[0] = (i == 0) ? CHAR_NEWLINE : CHAR_PROMPT_SCROLL;
@@ -153,8 +153,8 @@ u16 unref_sub_80EB5E0(u16 arg0)
     if (arg0 == 0xFFFF)
         return 0;
 
-    group = arg0 >> 9;
-    word = arg0 & 0x1FF;
+    group = EC_GROUP(arg0);
+    word = EC_INDEX(arg0);
     switch (group)
     {
     case EC_GROUP_POKEMON: // 0
@@ -321,7 +321,7 @@ void sub_80EB83C(void)
         group = EC_GROUP_LIFESTYLE;
 
     local2 = sub_80EB784(group);
-    sub_80EB3FC(gStringVar2, local2);
+    EasyChat_GetWordText(gStringVar2, local2);
 }
 
 u8 sub_80EB868(u8 arg0)
diff --git a/src/m4a_4.c b/src/m4a_4.c
index 99195ec00..2e1d140b4 100644
--- a/src/m4a_4.c
+++ b/src/m4a_4.c
@@ -45,7 +45,7 @@ void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16
     mplayInfo->ident = ID_NUMBER;
 }
 
-void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 pitch)
+void m4aMPlayPitchControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, s16 pitch)
 {
     s32 i;
     u32 bit;
diff --git a/src/mail.c b/src/mail.c
index 658d37976..fb9251a5d 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -92,7 +92,7 @@ void HandleReadMail(struct MailStruct *arg0, MainCallback arg1, bool8 arg2)
 
     ewram0.varFF = GAME_LANGUAGE;
     ewram0.var100 = 1;
-    ewram0.var104 = (MainCallback)sub_80EB3FC;
+    ewram0.var104 = (MainCallback)EasyChat_GetWordText;
     ewram0.var108 = (MainCallback)ConvertEasyChatWordsToString;
 
     mailDesign = arg0->itemId - ITEM_ORANGE_MAIL;
diff --git a/src/mauville_man.c b/src/mauville_man.c
new file mode 100644
index 000000000..4a77717f1
--- /dev/null
+++ b/src/mauville_man.c
@@ -0,0 +1,1311 @@
+#include "global.h"
+#include "bard_music.h"
+#include "mauville_man.h"
+#include "easy_chat.h"
+#include "event_data.h"
+#include "field_message_box.h"
+#include "m4a.h"
+#include "menu.h"
+#include "rom4.h"
+#include "rng.h"
+#include "script.h"
+#include "songs.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "trader.h"
+
+#define MACRO1(a) (((a) % 4) + (((a) / 8) & 1))
+
+extern struct MusicPlayerInfo gMPlay_SE2;
+
+extern u16 gScriptResult;
+extern u16 gSpecialVar_0x8004;
+
+extern const u8 gTextStoryteller_Story1Title[];
+extern const u8 gTextStoryteller_Story1Action[];
+extern const u8 gTextStoryteller_Story1Text[];
+extern const u8 gTextStoryteller_Story2Title[];
+extern const u8 gTextStoryteller_Story2Action[];
+extern const u8 gTextStoryteller_Story2Text[];
+extern const u8 gTextStoryteller_Story3Title[];
+extern const u8 gTextStoryteller_Story3Action[];
+extern const u8 gTextStoryteller_Story3Text[];
+extern const u8 gTextStoryteller_Story4Title[];
+extern const u8 gTextStoryteller_Story4Action[];
+extern const u8 gTextStoryteller_Story4Text[];
+extern const u8 gTextStoryteller_Story5Title[];
+extern const u8 gTextStoryteller_Story5Action[];
+extern const u8 gTextStoryteller_Story5Text[];
+extern const u8 gTextStoryteller_Story6Title[];
+extern const u8 gTextStoryteller_Story6Action[];
+extern const u8 gTextStoryteller_Story6Text[];
+extern const u8 gTextStoryteller_Story7Title[];
+extern const u8 gTextStoryteller_Story7Action[];
+extern const u8 gTextStoryteller_Story7Text[];
+extern const u8 gTextStoryteller_Story8Title[];
+extern const u8 gTextStoryteller_Story8Action[];
+extern const u8 gTextStoryteller_Story8Text[];
+extern const u8 gTextStoryteller_Story9Title[];
+extern const u8 gTextStoryteller_Story9Action[];
+extern const u8 gTextStoryteller_Story9Text[];
+extern const u8 gTextStoryteller_Story10Title[];
+extern const u8 gTextStoryteller_Story10Action[];
+extern const u8 gTextStoryteller_Story10Text[];
+extern const u8 gTextStoryteller_Story11Title[];
+extern const u8 gTextStoryteller_Story11Action[];
+extern const u8 gTextStoryteller_Story11Text[];
+extern const u8 gTextStoryteller_Story12Title[];
+extern const u8 gTextStoryteller_Story12Action[];
+extern const u8 gTextStoryteller_Story12Text[];
+extern const u8 gTextStoryteller_Story13Title[];
+extern const u8 gTextStoryteller_Story13Action[];
+extern const u8 gTextStoryteller_Story13Text[];
+extern const u8 gTextStoryteller_Story14Title[];
+extern const u8 gTextStoryteller_Story14Action[];
+extern const u8 gTextStoryteller_Story14Text[];
+extern const u8 gTextStoryteller_Story15Title[];
+extern const u8 gTextStoryteller_Story15Action[];
+extern const u8 gTextStoryteller_Story15Text[];
+extern const u8 gTextStoryteller_Story16Title[];
+extern const u8 gTextStoryteller_Story16Action[];
+extern const u8 gTextStoryteller_Story16Text[];
+extern const u8 gTextStoryteller_Story17Title[];
+extern const u8 gTextStoryteller_Story17Action[];
+extern const u8 gTextStoryteller_Story17Text[];
+extern const u8 gTextStoryteller_Story18Title[];
+extern const u8 gTextStoryteller_Story18Action[];
+extern const u8 gTextStoryteller_Story18Text[];
+extern const u8 gTextStoryteller_Story19Title[];
+extern const u8 gTextStoryteller_Story19Action[];
+extern const u8 gTextStoryteller_Story19Text[];
+extern const u8 gTextStoryteller_Story20Title[];
+extern const u8 gTextStoryteller_Story20Action[];
+extern const u8 gTextStoryteller_Story20Text[];
+extern const u8 gTextStoryteller_Story21Title[];
+extern const u8 gTextStoryteller_Story21Action[];
+extern const u8 gTextStoryteller_Story21Text[];
+extern const u8 gTextStoryteller_Story22Title[];
+extern const u8 gTextStoryteller_Story22Action[];
+extern const u8 gTextStoryteller_Story22Text[];
+extern const u8 gTextStoryteller_Story23Title[];
+extern const u8 gTextStoryteller_Story23Action[];
+extern const u8 gTextStoryteller_Story23Text[];
+extern const u8 gTextStoryteller_Story24Title[];
+extern const u8 gTextStoryteller_Story24Action[];
+extern const u8 gTextStoryteller_Story24Text[];
+extern const u8 gTextStoryteller_Story25Title[];
+extern const u8 gTextStoryteller_Story25Action[];
+extern const u8 gTextStoryteller_Story25Text[];
+extern const u8 gTextStoryteller_Story26Title[];
+extern const u8 gTextStoryteller_Story26Action[];
+extern const u8 gTextStoryteller_Story26Text[];
+extern const u8 gTextStoryteller_Story27Title[];
+extern const u8 gTextStoryteller_Story27Action[];
+extern const u8 gTextStoryteller_Story27Text[];
+extern const u8 gTextStoryteller_Story28Title[];
+extern const u8 gTextStoryteller_Story28Action[];
+extern const u8 gTextStoryteller_Story28Text[];
+extern const u8 gTextStoryteller_Story29Title[];
+extern const u8 gTextStoryteller_Story29Action[];
+extern const u8 gTextStoryteller_Story29Text[];
+extern const u8 gTextStoryteller_Story30Title[];
+extern const u8 gTextStoryteller_Story30Action[];
+extern const u8 gTextStoryteller_Story30Text[];
+extern const u8 gTextStoryteller_Story31Title[];
+extern const u8 gTextStoryteller_Story31Action[];
+extern const u8 gTextStoryteller_Story31Text[];
+extern const u8 gTextStoryteller_Story32Title[];
+extern const u8 gTextStoryteller_Story32Action[];
+extern const u8 gTextStoryteller_Story32Text[];
+extern const u8 gTextStoryteller_Story33Title[];
+extern const u8 gTextStoryteller_Story33Action[];
+extern const u8 gTextStoryteller_Story33Text[];
+extern const u8 gTextStoryteller_Story34Title[];
+extern const u8 gTextStoryteller_Story34Action[];
+extern const u8 gTextStoryteller_Story34Text[];
+extern const u8 gTextStoryteller_Story35Title[];
+extern const u8 gTextStoryteller_Story35Action[];
+extern const u8 gTextStoryteller_Story35Text[];
+extern const u8 gTextStoryteller_Story36Title[];
+extern const u8 gTextStoryteller_Story36Action[];
+extern const u8 gTextStoryteller_Story36Text[];
+
+extern struct BardSong gUnknown_03005DA0;
+
+EWRAM_DATA static u16 gUnknown_020388BC = 0;  // set but not used?
+
+static const u16 sDefaultBardSongLyrics[] =
+{
+#ifdef ENGLISH
+    EC_WORD_SISTER,
+    EC_WORD_EATS,
+    EC_WORD_SWEETS,
+    EC_WORD_VORACIOUS,
+    EC_WORD_AND,
+    EC_WORD_DROOLING,
+#else
+    EC_WORD_SISTER,
+    EC_WORD_MUST_BE,
+    EC_WORD_SWEETS,
+    EC_WORD_VORACIOUS,
+    EC_WORD_DROOLING,
+    EC_WORD_THICK,
+#endif
+};
+
+static const u8 *const sGiddyAdjectives[] =
+{
+    OtherText_SoPretty,
+    OtherText_SoDarling,
+    OtherText_SoRelaxed,
+    OtherText_SoSunny,
+    OtherText_SoDesirable,
+    OtherText_SoExciting,
+    OtherText_SoAmusing,
+    OtherText_SoMagical,
+};
+
+static const u8 *const sGiddyQuestions[] =
+{
+    OtherText_WantVacationNicePlace,
+    OtherText_BoughtCrayonsIsNice,
+    OtherText_IfWeCouldFloat,
+    OtherText_SandWashesAwayMakeSad,
+    OtherText_WhatsBottomSeaLike,
+    OtherText_SeeSettingSun,
+    OtherText_LyingInGreenGrass,
+    OtherText_SecretBasesWonderful,
+};
+
+static void sub_80F7DC0(void);
+static void Task_BardSong(u8);
+static void StartBardSong(u8);
+static void StorytellerSetup(void);
+static void sub_80F8428(void);
+
+static void SetupBard(void)
+{
+    u16 i;
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    bard->id = MAUVILLE_MAN_BARD;
+    bard->hasChangedSong = FALSE;
+    for (i = 0; i < 6; i++)
+        bard->songLyrics[i] = sDefaultBardSongLyrics[i];
+}
+
+static void SetupHipster(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->id = MAUVILLE_MAN_HIPSTER;
+    hipster->alreadySpoken = FALSE;
+}
+
+static void SetupStoryteller(void)
+{
+    StorytellerSetup();
+}
+
+static void SetupGiddy(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    giddy->id = MAUVILLE_MAN_GIDDY;
+    giddy->taleCounter = 0;
+}
+
+static void SetupTrader(void)
+{
+    TraderSetup();
+}
+
+void SetupMauvilleOldMan(void)
+{
+    u16 trainerId = (gSaveBlock2.playerTrainerId[1] << 8) | gSaveBlock2.playerTrainerId[0];
+
+    // Determine man based on the last digit of the player's trainer ID.
+    switch ((trainerId % 10) / 2)
+    {
+    case MAUVILLE_MAN_BARD:
+        SetupBard();
+        break;
+    case MAUVILLE_MAN_HIPSTER:
+        SetupHipster();
+        break;
+    case MAUVILLE_MAN_TRADER:
+        SetupTrader();
+        break;
+    case MAUVILLE_MAN_STORYTELLER:
+        SetupStoryteller();
+        break;
+    case MAUVILLE_MAN_GIDDY:
+        SetupGiddy();
+        break;
+    }
+    sub_80F83D0();
+}
+
+static u8 GetCurrentMauvilleOldMan(void)
+{
+    struct MauvilleManCommon *common = &gSaveBlock1.mauvilleMan.common;
+
+    return common->id;
+}
+
+void ScrSpecial_GetCurrentMauvilleMan(void)
+{
+    gScriptResult = GetCurrentMauvilleOldMan();
+}
+
+void ScrSpecial_HasBardSongBeenChanged(void)
+{
+    u16 *scriptResult = &gScriptResult; // why??
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    *scriptResult = bard->hasChangedSong;
+}
+
+void ScrSpecial_SaveBardSongLyrics(void)
+{
+    u16 i;
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    StringCopy(bard->playerName, gSaveBlock2.playerName);
+
+    for (i = 0; i < 4; i++)
+        bard->playerTrainerId[i] = gSaveBlock2.playerTrainerId[i];
+
+    for (i = 0; i < 6; i++)
+        bard->songLyrics[i] = bard->temporaryLyrics[i];
+
+    bard->hasChangedSong = TRUE;
+}
+
+// Copies lyrics into gStringVar4
+void PrepareSongText(void)
+{
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+    u16 specialVar = gSpecialVar_0x8004;  // It's a bit odd to use this temp variable, but it seems needed to match.
+    u16 *lyrics;
+    u16 lineNum;
+    u8 *wordEnd;
+    u8 *str;
+
+    lyrics = bard->temporaryLyrics;
+    if (specialVar == 0)
+        lyrics = bard->songLyrics;
+    wordEnd = gStringVar4;
+    str = wordEnd;
+    // Put three words on each line
+    for (lineNum = 0; lineNum < 2; lineNum++)
+    {
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        str++;
+        *(wordEnd++) = CHAR_SPACE;
+
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        str++;
+        *(wordEnd++) = CHAR_NEWLINE;
+
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
+        {
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
+        }
+
+        if (lineNum == 0)
+        {
+            *(wordEnd++) = EXT_CTRL_CODE_BEGIN;
+            *(wordEnd++) = 15;
+        }
+    }
+}
+
+void ScrSpecial_PlayBardSong(void)
+{
+    StartBardSong(gSpecialVar_0x8004);
+    MenuDisplayMessageBox();
+    ScriptContext1_Stop();
+}
+
+void ScrSpecial_GetHipsterSpokenFlag(void)
+{
+    u16 *scriptResult = &gScriptResult; // again??
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    *scriptResult = hipster->alreadySpoken;
+}
+
+void ScrSpecial_SetHipsterSpokenFlag(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->alreadySpoken = TRUE;
+}
+
+void ScrSpecial_HipsterTeachWord(void)
+{
+    u16 var = sub_80EB8EC();
+
+    if (var == 0xFFFF)
+    {
+        gScriptResult = FALSE;
+    }
+    else
+    {
+        EasyChat_GetWordText(gStringVar1, var);
+        gScriptResult = TRUE;
+    }
+}
+
+void ScrSpecial_GiddyShouldTellAnotherTale(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    if (giddy->taleCounter == 10)
+    {
+        gScriptResult = FALSE;
+        giddy->taleCounter = 0;
+    }
+    else
+    {
+        gScriptResult = TRUE;
+    }
+}
+
+void ScrSpecial_GenerateGiddyLine(void)
+{
+    struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+    if (giddy->taleCounter == 0)
+        sub_80F7DC0();
+
+    if (giddy->randomWords[giddy->taleCounter] != 0xFFFF) // is not the last element of the array?
+    {
+        u8 *stringPtr;
+        u32 adjective = Random();
+
+        adjective %= 8;
+        stringPtr = EasyChat_GetWordText(gStringVar4, giddy->randomWords[giddy->taleCounter]);
+        stringPtr = StringCopy(stringPtr, gOtherText_Is);
+        stringPtr = StringCopy(stringPtr, sGiddyAdjectives[adjective]);
+        StringCopy(stringPtr, gOtherText_DontYouAgree);
+    }
+    else
+    {
+        StringCopy(gStringVar4, sGiddyQuestions[giddy->questionList[giddy->questionNum++]]);
+    }
+
+    if (!(Random() % 10))
+        giddy->taleCounter = 10;
+    else
+        giddy->taleCounter++;
+
+    gScriptResult = TRUE;
+}
+
+#ifdef NONMATCHING
+static void sub_80F7DC0(void)
+{
+    u16 arr[][2] =
+    {
+        { 0x0, 0},
+        { 0xC, 0},
+        { 0xD, 0},
+        {0x12, 0},
+        {0x13, 0},
+        {0x15, 0},
+    };
+    u16 i;
+    u16 r10;
+    u16 r7;
+
+    for (i = 0; i < 8; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        //gSaveBlock1.mauvilleMan.giddy.questionList[i] = i;
+        giddy->questionList[i] = i;
+    }
+
+    // Scramble questions
+    for (i = 0; i < 8; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        /*
+        u16 r1 = Random() % (i + 1);
+        u8 r7 = gSaveBlock1.mauvilleMan.giddy.questionList[i];
+        gSaveBlock1.mauvilleMan.giddy.questionList[i] = gSaveBlock1.mauvilleMan.giddy.questionList[r1];
+        gSaveBlock1.mauvilleMan.giddy.questionList[r1] = r7;
+        */
+        u16 r1 = Random() % (i + 1);
+        u8 r7 = giddy->questionList[i];
+        giddy->questionList[i] = giddy->questionList[r1];
+        giddy->questionList[r1] = r7;
+    }
+
+    r10 = 0;
+    for (i = 0; i < 6; i++)
+    {
+        arr[i][1] = sub_80EAE88(arr[i][0]);
+        r10 += arr[i][1];
+    }
+
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+        giddy->questionNum = 0;
+    }
+    //gSaveBlock1.mauvilleMan.giddy.questionNum = 0;
+
+    r7 = 0;
+    for (i = 0; i < 10; i++)
+    {
+        struct MauvilleManGiddy *giddy = &gSaveBlock1.mauvilleMan.giddy;
+
+        u16 var = Random() % 10;
+        if (var < 3 && r7 < 8)
+        {
+            //gSaveBlock1.mauvilleMan.giddy.randomWords[i] = 0xFFFF;
+            giddy->randomWords[i] = 0xFFFF;
+            r7++;
+        }
+        //_080F7E90
+        else
+        {
+            s16 r2 = Random() % r10;
+
+            u16 r1 = 0;
+
+            while (i < 6)  // comparing the wrong variable
+            {
+                r2 = arr[r1][1] - r2;
+                if (r2 <= 0)
+                    break;
+                r1++;
+            }
+
+            if (r1 == 6)
+                r1 = 0;
+            //gSaveBlock1.mauvilleMan.giddy.randomWords[i] = sub_80EB784(arr[r1][0]);
+            giddy->randomWords[i] = sub_80EB784(arr[r1][0]);
+        }
+    }
+}
+#else
+
+static const u16 gUnknown_083E53C8[][2] =
+{
+    { 0x0, 0},
+    { 0xC, 0},
+    { 0xD, 0},
+    {0x12, 0},
+    {0x13, 0},
+    {0x15, 0},
+};
+
+__attribute__((naked))
+static void sub_80F7DC0(void)
+{
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x18\n\
+    ldr r1, _080F7E84 @ =gUnknown_083E53C8\n\
+    mov r0, sp\n\
+    movs r2, 0x18\n\
+    bl memcpy\n\
+    movs r5, 0\n\
+    movs r0, 0x2\n\
+    add r0, sp\n\
+    mov r8, r0\n\
+    ldr r1, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    adds r1, 0x18\n\
+    adds r3, r1, 0\n\
+_080F7DE4:\n\
+    adds r0, r3, r5\n\
+    strb r5, [r0]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x7\n\
+    bls _080F7DE4\n\
+    movs r5, 0\n\
+    ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    adds r2, 0x4\n\
+    mov r9, r2\n\
+    adds r6, r1, 0\n\
+_080F7DFC:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    adds r4, r5, 0x1\n\
+    adds r1, r4, 0\n\
+    bl __modsi3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    adds r2, r6, r5\n\
+    ldrb r7, [r2]\n\
+    adds r1, r6, r1\n\
+    ldrb r0, [r1]\n\
+    strb r0, [r2]\n\
+    strb r7, [r1]\n\
+    lsls r4, 16\n\
+    lsrs r5, r4, 16\n\
+    cmp r5, 0x7\n\
+    bls _080F7DFC\n\
+    movs r3, 0\n\
+    mov r10, r3\n\
+    movs r5, 0\n\
+_080F7E2A:\n\
+    lsls r4, r5, 2\n\
+    mov r1, sp\n\
+    adds r0, r1, r4\n\
+    ldrb r0, [r0]\n\
+    bl sub_80EAE88\n\
+    add r4, r8\n\
+    strh r0, [r4]\n\
+    add r0, r10\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r10, r0\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x5\n\
+    bls _080F7E2A\n\
+    movs r0, 0\n\
+    ldr r2, _080F7E88 @ =gSaveBlock1 + 0x2D94\n\
+    strb r0, [r2, 0x2]\n\
+    movs r7, 0\n\
+    movs r5, 0\n\
+_080F7E56:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r1, 0x2\n\
+    bhi _080F7E90\n\
+    cmp r7, 0x7\n\
+    bhi _080F7E90\n\
+    lsls r0, r5, 1\n\
+    add r0, r9\n\
+    ldr r1, _080F7E8C @ =0x0000ffff\n\
+    strh r1, [r0]\n\
+    adds r0, r7, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r7, r0, 16\n\
+    adds r4, r5, 0x1\n\
+    b _080F7EE2\n\
+    .align 2, 0\n\
+_080F7E84: .4byte gUnknown_083E53C8\n\
+_080F7E88: .4byte gSaveBlock1 + 0x2D94\n\
+_080F7E8C: .4byte 0x0000ffff\n\
+_080F7E90:\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    mov r1, r10\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    movs r1, 0\n\
+    adds r4, r5, 0x1\n\
+    lsls r6, r5, 1\n\
+    cmp r5, 0x5\n\
+    bhi _080F7ECC\n\
+    mov r3, r8\n\
+    ldrh r0, [r3]\n\
+    b _080F7EC2\n\
+_080F7EB2:\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    cmp r5, 0x5\n\
+    bhi _080F7ECC\n\
+    lsls r0, r1, 2\n\
+    adds r0, r3, r0\n\
+    ldrh r0, [r0]\n\
+_080F7EC2:\n\
+    subs r0, r2, r0\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    cmp r0, 0\n\
+    bgt _080F7EB2\n\
+_080F7ECC:\n\
+    cmp r1, 0x6\n\
+    bne _080F7ED2\n\
+    movs r1, 0\n\
+_080F7ED2:\n\
+    lsls r0, r1, 2\n\
+    add r0, sp\n\
+    ldrh r0, [r0]\n\
+    bl sub_80EB784\n\
+    mov r2, r9\n\
+    adds r1, r2, r6\n\
+    strh r0, [r1]\n\
+_080F7EE2:\n\
+    lsls r0, r4, 16\n\
+    lsrs r5, r0, 16\n\
+    cmp r5, 0x9\n\
+    bls _080F7E56\n\
+    add sp, 0x18\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .syntax divided\n");
+}
+#endif
+
+static void sub_80F7EFC(void)
+{
+    struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+
+    bard->hasChangedSong = FALSE;
+}
+
+static void sub_80F7F0C(void)
+{
+    struct MauvilleManHipster *hipster = &gSaveBlock1.mauvilleMan.hipster;
+
+    hipster->alreadySpoken = FALSE;
+}
+
+static void sub_80F7F18(void)
+{
+    sub_8109A20();
+}
+
+static void sub_80F7F24(void)
+{
+    sub_80F8428();
+}
+
+void sub_80F7F30(void)
+{
+    switch (GetCurrentMauvilleOldMan())
+    {
+    case MAUVILLE_MAN_BARD:
+        sub_80F7EFC();
+        break;
+    case MAUVILLE_MAN_HIPSTER:
+        sub_80F7F0C();
+        break;
+    case MAUVILLE_MAN_STORYTELLER:
+        sub_80F7F24();
+        break;
+    case MAUVILLE_MAN_TRADER:
+        sub_80F7F18();
+        break;
+    case MAUVILLE_MAN_GIDDY:
+        break;
+    }
+    sub_80F83D0();
+}
+
+#define tState data[0]
+#define tCharIndex data[3]
+#define tCurrWord data[4]
+#define tUseTemporaryLyrics data[5]
+
+static void StartBardSong(bool8 useTemporaryLyrics)
+{
+    u8 taskId = CreateTask(Task_BardSong, 0x50);
+
+    gTasks[taskId].tUseTemporaryLyrics = useTemporaryLyrics;
+}
+
+static void BardSing(struct Task *task, struct BardSong *song)
+{
+    switch (task->tState)
+    {
+    case 0:  // Initialize song
+        {
+            struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+            u16 *lyrics;
+            s32 i;
+
+            // Copy lyrics
+            if (gSpecialVar_0x8004 == 0)
+                lyrics = bard->songLyrics;
+            else
+                lyrics = bard->temporaryLyrics;
+            for (i = 0; i < 6; i++)
+                song->lyrics[i] = lyrics[i];
+
+            // Clear phonemes
+            for (i = 0; i < 6; i++)
+            {
+                song->phonemes[i].sound = 0xFFFF;
+                song->phonemes[i].length = 0;
+                song->phonemes[i].pitch = 0;
+                song->phonemes[i].volume = 0;
+            }
+            song->currWord = 0;
+            song->currPhoneme = 0;
+            song->var04 = 0;
+        }
+        break;
+    case 1:  // Wait for BGM to end
+        break;
+    case 2:  // Initialize word
+        {
+            u16 word = song->lyrics[song->currWord];
+            const struct BardSound *sounds = GetWordSounds(EC_GROUP(word), EC_INDEX(word));
+
+            song->var04 = 0;
+            GetWordPhonemes(song, sounds, MACRO1(word));
+        }
+        break;
+    case 3:
+    case 4:
+        {
+            struct BardPhoneme *phoneme = &song->phonemes[song->currPhoneme];
+
+            switch (song->state)
+            {
+            case 0:
+                if (song->phonemeTimer == 0)  // Timer has expired. Move to next phoneme
+                {
+                    if (song->currPhoneme == 6 || phoneme->sound == 0xFF)
+                    {
+                        song->state = 0xFE;
+                        break;
+                    }
+                    song->phonemeTimer = phoneme->length;
+                    if (phoneme->sound <= 50)
+                    {
+                        u16 num = phoneme->sound / 3;
+
+                        m4aSongNumStart(249 + num * 3);
+                    }
+                    song->state = 1;
+                }
+                else
+                {
+                    if (song->voiceInflection > 10)
+                        song->volume -= 2;
+                    if (song->voiceInflection & 1)
+                        song->pitch += 64;
+                    else
+                        song->pitch -= 64;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                    song->voiceInflection++;
+                }
+                song->phonemeTimer--;
+                break;
+            case 1:
+                song->currPhoneme++;
+                song->state = 0;
+                if (phoneme->sound <= 50)
+                {
+                    song->volume = 0x100 + phoneme->volume * 16;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    song->pitch = 0x200 + phoneme->pitch;
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                }
+                break;
+            case 0xFE:
+                m4aMPlayStop(&gMPlay_SE2);
+                song->state = 0xFF;
+                break;
+            }
+        }
+        break;
+    case 5:
+        break;
+    }
+}
+
+static void Task_BardSong(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];  // r5
+
+    BardSing(task, &gUnknown_03005DA0);
+    switch (task->tState)
+    {
+    case 0:  // Initialize song
+        PrepareSongText();
+        InitWindowFromConfig(gMenuWindowPtr, &gWindowConfig_81E6CE4);
+        sub_8002EB0(gMenuWindowPtr, gStringVar4, 2, 4, 15);
+        task->data[1] = 0;
+        task->data[2] = 0;
+        task->tCharIndex = 0;
+        task->tCurrWord = 0;
+        FadeOutBGMTemporarily(4);
+        task->tState = 1;
+        break;
+    case 1:  // Wait for BGM to end
+        if (IsBGMPausedOrStopped())
+            task->tState = 2;
+        break;
+    case 2:  // Initialize word
+        {
+            struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
+            u8 *str = gStringVar4 + task->tCharIndex;
+            u16 wordLen = 0;
+            // Can't get it to match without hacking
+            u32 temp;
+            register s16 zero asm("r1");
+
+            while (*str != CHAR_SPACE
+                && *str != CHAR_NEWLINE
+                && *str != EXT_CTRL_CODE_BEGIN
+                && *str != EOS)
+            {
+                str++;
+                wordLen++;
+            }
+            if (!task->tUseTemporaryLyrics)
+                gUnknown_020388BC = MACRO1(bard->songLyrics[task->tCurrWord]);
+            else
+                gUnknown_020388BC = MACRO1(bard->temporaryLyrics[task->tCurrWord]);
+            temp = gUnknown_03005DA0.var04 / wordLen;
+            zero = 0;
+            gUnknown_03005DA0.var04 = temp;
+            if (gUnknown_03005DA0.var04 <= 0)
+                gUnknown_03005DA0.var04 = 1;
+            task->tCurrWord++;
+            if (task->data[2] == 0)
+                task->tState = 3;
+            else
+                task->tState = 5;
+            task->data[1] = zero;
+        }
+        break;
+    case 5:
+        if (task->data[2] == 0)
+            task->tState = 3;
+        else
+            task->data[2]--;
+        break;
+    case 3:
+        if (gStringVar4[task->tCharIndex] == EOS)
+        {
+            FadeInNewBGM(BGM_POKECEN, 6);
+            m4aMPlayFadeOutTemporarily(&gMPlay_SE2, 2);
+            EnableBothScriptContexts();
+            DestroyTask(taskId);
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_SPACE)
+        {
+            sub_8003418(gMenuWindowPtr);
+            task->tCharIndex++;
+            task->tState = 2;
+            task->data[2] = 0;
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_NEWLINE)
+        {
+            task->tCharIndex++;
+            task->tState = 2;
+            task->data[2] = 0;
+        }
+        else if (gStringVar4[task->tCharIndex] == EXT_CTRL_CODE_BEGIN)
+        {
+            task->tCharIndex += 2;  // skip over control codes
+            task->tState = 2;
+            task->data[2] = 8;
+        }
+        else if (gStringVar4[task->tCharIndex] == CHAR_SONG_WORD_SEPARATOR)
+        {
+            gStringVar4[task->tCharIndex] = CHAR_SPACE;  // restore it back to a space
+            sub_8003418(gMenuWindowPtr);
+            task->tCharIndex++;
+            task->data[2] = 0;
+        }
+        else
+        {
+            switch (task->data[1])
+            {
+            case 0:
+                sub_8003418(gMenuWindowPtr);
+                task->data[1]++;
+                break;
+            case 1:
+                task->data[1]++;
+                break;
+            case 2:
+                task->tCharIndex++;
+                task->data[1] = 0;
+                task->data[2] = gUnknown_03005DA0.var04;
+                task->tState = 4;
+                break;
+            }
+        }
+        break;
+    case 4:
+        task->data[2]--;
+        if (task->data[2] == 0)
+            task->tState = 3;
+        break;
+    }
+}
+
+void sub_80F83D0(void)
+{
+    VarSet(0x4010, 0x45 + GetCurrentMauvilleOldMan());
+}
+
+struct Story
+{
+    u8 stat;
+    u8 minVal;
+    const u8 *title;
+    const u8 *action;
+    const u8 *fullText;
+};
+
+static const struct Story sStorytellerStories[] =
+{
+    {0x32, 1, gTextStoryteller_Story1Title,  gTextStoryteller_Story1Action,  gTextStoryteller_Story1Text},
+    {0x02, 1, gTextStoryteller_Story2Title,  gTextStoryteller_Story2Action,  gTextStoryteller_Story2Text},
+    {0x03, 1, gTextStoryteller_Story3Title,  gTextStoryteller_Story3Action,  gTextStoryteller_Story3Text},
+    {0x04, 1, gTextStoryteller_Story4Title,  gTextStoryteller_Story4Action,  gTextStoryteller_Story4Text},
+    {0x06, 1, gTextStoryteller_Story5Title,  gTextStoryteller_Story5Action,  gTextStoryteller_Story5Text},
+    {0x09, 1, gTextStoryteller_Story6Title,  gTextStoryteller_Story6Action,  gTextStoryteller_Story6Text},
+    {0x0B, 1, gTextStoryteller_Story7Title,  gTextStoryteller_Story7Action,  gTextStoryteller_Story7Text},
+    {0x0C, 1, gTextStoryteller_Story8Title,  gTextStoryteller_Story8Action,  gTextStoryteller_Story8Text},
+    {0x0D, 1, gTextStoryteller_Story9Title,  gTextStoryteller_Story9Action,  gTextStoryteller_Story9Text},
+    {0x0E, 1, gTextStoryteller_Story10Title, gTextStoryteller_Story10Action, gTextStoryteller_Story10Text},
+    {0x0F, 1, gTextStoryteller_Story11Title, gTextStoryteller_Story11Action, gTextStoryteller_Story11Text},
+    {0x10, 1, gTextStoryteller_Story12Title, gTextStoryteller_Story12Action, gTextStoryteller_Story12Text},
+    {0x11, 1, gTextStoryteller_Story13Title, gTextStoryteller_Story13Action, gTextStoryteller_Story13Text},
+    {0x12, 1, gTextStoryteller_Story14Title, gTextStoryteller_Story14Action, gTextStoryteller_Story14Text},
+    {0x13, 1, gTextStoryteller_Story15Title, gTextStoryteller_Story15Action, gTextStoryteller_Story15Text},
+    {0x14, 1, gTextStoryteller_Story16Title, gTextStoryteller_Story16Action, gTextStoryteller_Story16Text},
+    {0x1A, 1, gTextStoryteller_Story17Title, gTextStoryteller_Story17Action, gTextStoryteller_Story17Text},
+    {0x1B, 1, gTextStoryteller_Story18Title, gTextStoryteller_Story18Action, gTextStoryteller_Story18Text},
+    {0x1C, 1, gTextStoryteller_Story19Title, gTextStoryteller_Story19Action, gTextStoryteller_Story19Text},
+    {0x1D, 2, gTextStoryteller_Story20Title, gTextStoryteller_Story20Action, gTextStoryteller_Story20Text},
+    {0x1E, 1, gTextStoryteller_Story21Title, gTextStoryteller_Story21Action, gTextStoryteller_Story21Text},
+    {0x21, 1, gTextStoryteller_Story22Title, gTextStoryteller_Story22Action, gTextStoryteller_Story22Text},
+    {0x24, 1, gTextStoryteller_Story23Title, gTextStoryteller_Story23Action, gTextStoryteller_Story23Text},
+    {0x25, 1, gTextStoryteller_Story24Title, gTextStoryteller_Story24Action, gTextStoryteller_Story24Text},
+    {0x26, 1, gTextStoryteller_Story25Title, gTextStoryteller_Story25Action, gTextStoryteller_Story25Text},
+    {0x27, 1, gTextStoryteller_Story26Title, gTextStoryteller_Story26Action, gTextStoryteller_Story26Text},
+    {0x28, 1, gTextStoryteller_Story27Title, gTextStoryteller_Story27Action, gTextStoryteller_Story27Text},
+    {0x29, 1, gTextStoryteller_Story28Title, gTextStoryteller_Story28Action, gTextStoryteller_Story28Text},
+    {0x2A, 1, gTextStoryteller_Story29Title, gTextStoryteller_Story29Action, gTextStoryteller_Story29Text},
+    {0x2B, 1, gTextStoryteller_Story30Title, gTextStoryteller_Story30Action, gTextStoryteller_Story30Text},
+    {0x2C, 1, gTextStoryteller_Story31Title, gTextStoryteller_Story31Action, gTextStoryteller_Story31Text},
+    {0x2D, 1, gTextStoryteller_Story32Title, gTextStoryteller_Story32Action, gTextStoryteller_Story32Text},
+    {0x2E, 1, gTextStoryteller_Story33Title, gTextStoryteller_Story33Action, gTextStoryteller_Story33Text},
+    {0x2F, 1, gTextStoryteller_Story34Title, gTextStoryteller_Story34Action, gTextStoryteller_Story34Text},
+    {0x30, 1, gTextStoryteller_Story35Title, gTextStoryteller_Story35Action, gTextStoryteller_Story35Text},
+    {0x31, 1, gTextStoryteller_Story36Title, gTextStoryteller_Story36Action, gTextStoryteller_Story36Text},
+};
+
+static void StorytellerSetup(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    s32 i;
+
+    storyteller->id = MAUVILLE_MAN_STORYTELLER;
+    storyteller->alreadyRecorded = FALSE;
+    for (i = 0; i < 4; i++)
+    {
+        storyteller->gameStatIDs[i] = 0;
+        storyteller->trainerNames[0][i] = EOS;  // Maybe they meant storyteller->trainerNames[i][0] instead?
+    }
+}
+
+static void sub_80F8428(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    storyteller->id = MAUVILLE_MAN_STORYTELLER;
+    storyteller->alreadyRecorded = FALSE;
+}
+
+static u32 StorytellerGetGameStat(u8 stat)
+{
+    if (stat == NUM_GAME_STATS)
+        stat = 0;
+    return GetGameStat(stat);
+}
+
+static const struct Story *GetStoryByStat(u32 stat)
+{
+    s32 i;
+
+    for (i = 0; i < 36; i++)
+    {
+        if (sStorytellerStories[i].stat == stat)
+            return &sStorytellerStories[i];
+    }
+    return &sStorytellerStories[35];
+}
+
+static const u8 *GetStoryTitleByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->title;
+}
+
+static const u8 *GetStoryTextByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->fullText;
+}
+
+static const u8 *GetStoryActionByStat(u32 stat)
+{
+    return GetStoryByStat(stat)->action;
+}
+
+static u8 GetFreeStorySlot(void)
+{
+    u8 i;
+
+    for (i = 0; i < 4; i++)
+    {
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+        if (storyteller->gameStatIDs[i] == 0)
+            break;
+    }
+    return i;
+}
+
+static u32 StorytellerGetRecordedTrainerStat(u32 trainer)
+{
+    u8 *ptr = gSaveBlock1.mauvilleMan.storyteller.statValues[trainer];
+
+    return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
+}
+
+static void StorytellerSetRecordedTrainerStat(u32 trainer, u32 val)
+{
+    u8 *ptr = gSaveBlock1.mauvilleMan.storyteller.statValues[trainer];
+
+    ptr[0] = val;
+    ptr[1] = val >> 8;
+    ptr[2] = val >> 16;
+    ptr[3] = val >> 24;
+}
+
+static bool32 HasTrainerStatIncreased(u32 trainer)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    if (StorytellerGetGameStat(storyteller->gameStatIDs[trainer]) > StorytellerGetRecordedTrainerStat(trainer))
+        return TRUE;
+    else
+        return FALSE;
+}
+
+static void GetStoryByStattellerPlayerName(u32 player, void *dst)
+{
+    u8 *name = gSaveBlock1.mauvilleMan.storyteller.trainerNames[player];
+
+    memset(dst, EOS, 8);
+    memcpy(dst, name, 7);
+}
+
+static void StorytellerSetPlayerName(u32 player, const u8 *src)
+{
+    u8 *name = gSaveBlock1.mauvilleMan.storyteller.trainerNames[player];
+    u8 len = StringLength(src);
+
+    memset(name, EOS, 7);
+    StringCopyN(name, src, len);
+}
+
+static void StorytellerRecordNewStat(u32 player, u32 stat)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    storyteller->gameStatIDs[player] = stat;
+    StorytellerSetPlayerName(player, gSaveBlock2.playerName);
+    StorytellerSetRecordedTrainerStat(player, StorytellerGetGameStat(stat));
+    ConvertIntToDecimalStringN(gStringVar1, StorytellerGetGameStat(stat), 0, 10);
+    StringCopy(gStringVar2, GetStoryActionByStat(stat));
+}
+
+static void ScrambleStatList(u8 *arr, s32 count)
+{
+    s32 i;
+
+    for (i = 0; i < count; i++)
+        arr[i] = i;
+    for (i = 0; i < count; i++)
+    {
+        u32 a = Random() % count;
+        u32 b = Random() % count;
+        u8 temp = arr[a];
+        arr[a] = arr[b];
+        arr[b] = temp;
+    }
+}
+
+// What purpose does this struct even serve? Only the length field is used.
+static const struct {u32 length; struct MauvilleManStoryteller *unused1; u32 unused2;} sStorytellerStuff =
+{
+    36,
+    &gSaveBlock1.mauvilleMan.storyteller,  // unused
+    12,                                    // unused
+};
+
+static bool8 StorytellerInitializeRandomStat(void)
+{
+    u8 arr[sStorytellerStuff.length];
+    s32 i;
+    s32 j;
+
+    ScrambleStatList(arr, 36);
+    for (i = 0; i < 36; i++)
+    {
+        u8 stat = sStorytellerStories[arr[i]].stat;
+        u8 minVal = sStorytellerStories[arr[i]].minVal;
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+        for (j = 0; j < 4; j++)
+        {
+            if (gSaveBlock1.mauvilleMan.storyteller.gameStatIDs[j] == stat)
+                break;
+        }
+        if (j == 4 && StorytellerGetGameStat(stat) >= minVal)
+        {
+            storyteller->alreadyRecorded = TRUE;
+            StorytellerRecordNewStat(GetFreeStorySlot(), stat);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static void StorytellerDisplayStory(u32 player)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    u8 stat = storyteller->gameStatIDs[player];
+
+    ConvertIntToDecimalStringN(gStringVar1, StorytellerGetRecordedTrainerStat(player), 0, 10);
+    StringCopy(gStringVar2, GetStoryActionByStat(stat));
+    GetStoryByStattellerPlayerName(player, gStringVar3);
+    ShowFieldMessage(GetStoryTextByStat(stat));
+}
+
+static void PrintStoryList(void)
+{
+    s32 i;
+
+    MenuDrawTextWindow(0, 0, 25, 4 + GetFreeStorySlot() * 2);
+    for (i = 0; i < 4; i++)
+    {
+        struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+        u8 stat = storyteller->gameStatIDs[i];
+
+        if (stat == 0)
+            break;
+        MenuPrint(GetStoryTitleByStat(stat), 1, 2 + i * 2);
+    }
+    MenuPrint(gPCText_Cancel, 1, 2 + i * 2);
+}
+
+static u8 gUnknown_03000748;
+
+static void Task_StoryListMenu(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+    s32 selection;
+
+    switch (task->data[0])
+    {
+    case 0:
+        PrintStoryList();
+        InitMenu(0, 1, 2, GetFreeStorySlot() + 1, 0, 24);
+        task->data[0]++;
+        break;
+    case 1:
+        selection = ProcessMenuInput();
+        if (selection == -2)
+            break;
+        if (selection == -1 || selection == GetFreeStorySlot())
+        {
+            gScriptResult = 0;
+        }
+        else
+        {
+            gScriptResult = 1;
+            gUnknown_03000748 = selection;
+        }
+        HandleDestroyMenuCursors();
+        MenuZeroFillWindowRect(0, 0, 25, 12);
+        DestroyTask(taskId);
+        EnableBothScriptContexts();
+        break;
+    }
+}
+
+// Sets gScriptResult to TRUE if player selected a story
+void ScrSpecial_StorytellerStoryListMenu(void)
+{
+    CreateTask(Task_StoryListMenu, 0x50);
+}
+
+void ScrSpecial_StorytellerDisplayStory(void)
+{
+    StorytellerDisplayStory(gUnknown_03000748);
+}
+
+u8 ScrSpecial_StorytellerGetFreeStorySlot(void)
+{
+    return GetFreeStorySlot();
+}
+
+// Returns TRUE if stat has increased
+bool8 ScrSpecial_StorytellerUpdateStat(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+    u8 r4 = storyteller->gameStatIDs[gUnknown_03000748];
+
+    if (HasTrainerStatIncreased(gUnknown_03000748) == TRUE)
+    {
+        StorytellerRecordNewStat(gUnknown_03000748, r4);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+bool8 ScrSpecial_HasStorytellerAlreadyRecorded(void)
+{
+    struct MauvilleManStoryteller *storyteller = &gSaveBlock1.mauvilleMan.storyteller;
+
+    if (storyteller->alreadyRecorded == FALSE)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+bool8 ScrSpecial_StorytellerInitializeRandomStat(void)
+{
+    return StorytellerInitializeRandomStat();
+}
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
deleted file mode 100644
index 93684fc60..000000000
--- a/src/mauville_old_man.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include "global.h"
-#include "mauville_old_man.h"
-#include "easy_chat.h"
-#include "menu.h"
-#include "rng.h"
-#include "script.h"
-#include "string_util.h"
-#include "strings.h"
-#include "trader.h"
-
-extern u16 gScriptResult;
-extern u16 gSpecialVar_0x8004;
-
-extern u32 gUnknown_083E5388[];
-extern u32 gUnknown_083E53A8[];
-
-extern u16 gUnknown_083E537C[];
-
-void sub_80F7A34(void)
-{
-    u16 i;
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D94 = 0;
-    oldMan->oldMan1.unk_2DBD = 0;
-
-    for(i = 0; i < 6; i++)
-        oldMan->oldMan1.mauvilleOldMan_ecArray[i] = gUnknown_083E537C[i];
-}
-
-void sub_80F7A6C(void)
-{
-    struct UnkMauvilleOldManStruct *bard = &gSaveBlock1.oldMan.oldMan1;
-
-    bard->unk_2D94 = 1;
-    bard->unk_2D95 = 0;
-}
-
-void sub_80F7A7C(void)
-{
-    sub_80F83F8();
-}
-
-void sub_80F7A88(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D94 = 4;
-    oldMan->oldMan1.unk_2D95 = 0;
-}
-
-void sub_80F7A98(void)
-{
-    sub_81099CC();
-}
-
-void SetMauvilleOldMan(void)
-{
-    u32 var = ((u16)((gSaveBlock2.playerTrainerId[1] << 8 | gSaveBlock2.playerTrainerId[0])) % 10) / 2;
-
-    switch(var)
-    {
-    case 0:
-        sub_80F7A34();
-        break;
-    case 1:
-        sub_80F7A6C();
-        break;
-    case 2:
-        sub_80F7A98();
-        break;
-    case 3:
-        sub_80F7A7C();
-        break;
-    case 4:
-        sub_80F7A88();
-        break;
-    }
-    sub_80F83D0();
-}
-
-u8 GetCurrentMauvilleOldMan(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    return oldMan->oldMan1.unk_2D94;
-}
-
-void sub_80F7B14(void)
-{
-    gScriptResult = GetCurrentMauvilleOldMan();
-}
-
-void sub_80F7B2C(void)
-{
-    u16 *scriptPtr = &gScriptResult; // why??
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    *scriptPtr = oldMan->oldMan1.unk_2DBD;
-}
-
-void sub_80F7B40(void)
-{
-    u16 i;
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-    //struct UnkMauvilleOldManStruct *oldManStruct = &gSaveBlock1.oldManStruct;
-
-    StringCopy(oldMan->oldMan1.playerName, gSaveBlock2.playerName);
-
-    for(i = 0; i < 4; i++)
-        oldMan->oldMan1.playerTrainerId[i] = gSaveBlock2.playerTrainerId[i];
-
-    for(i = 0; i < 6; i++)
-        oldMan->oldMan1.mauvilleOldMan_ecArray[i] = oldMan->oldMan1.mauvilleOldMan_ecArray2[i];
-
-    oldMan->oldMan1.unk_2DBD = 1;
-}
-
-void sub_80F7BA0(void)
-{
-    struct UnkMauvilleOldManStruct *oldMan = &gSaveBlock1.oldMan.oldMan1;
-    u16 specialVar = gSpecialVar_0x8004;  // It's a bit odd to use this temp variable, but it seems needed to match.
-    u16 *r5;
-    u16 i;
-    u8 *ptr;
-    u8 *r4;
-
-    r5 = oldMan->mauvilleOldMan_ecArray2;
-    if (specialVar == 0)
-        r5 = oldMan->mauvilleOldMan_ecArray;
-    ptr = gStringVar4;
-    r4 = ptr;
-    for (i = 0; i < 2; i++)
-    {
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        r4++;
-        *(ptr++) = 0;
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        r4++;
-        *(ptr++) = 0xFE;
-        ptr = sub_80EB3FC(ptr, *(r5++));
-        while (ptr != r4)
-        {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
-        }
-        //_080F7C2A
-        if (i == 0)
-        {
-            *(ptr++) = EXT_CTRL_CODE_BEGIN;
-            *(ptr++) = 0xF;
-        }
-    }
-}
-
-void sub_80F7C54(void)
-{
-    sub_80F7F80(gSpecialVar_0x8004);
-    MenuDisplayMessageBox();
-    ScriptContext1_Stop();
-}
-
-void sub_80F7C70(void)
-{
-    u16 *scriptPtr = &gScriptResult; // again??
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    *scriptPtr = oldMan->oldMan1.unk_2D95;
-}
-
-void sub_80F7C84(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    oldMan->oldMan1.unk_2D95 = 1;
-}
-
-void sub_80F7C90(void)
-{
-    u16 var = sub_80EB8EC();
-
-    if(var == 0xFFFF)
-    {
-        gScriptResult = FALSE;
-    }
-    else
-    {
-        sub_80EB3FC(gStringVar1, var);
-        gScriptResult = TRUE;
-    }
-}
-
-void sub_80F7CC8(void)
-{
-    OldMan *oldMan = &gSaveBlock1.oldMan;
-
-    if(oldMan->oldMan1.unk_2D95 == 10)
-    {
-        gScriptResult = FALSE;
-        oldMan->oldMan1.unk_2D95 = 0;
-    }
-    else
-        gScriptResult = TRUE;
-}
-
-void sub_80F7CF4(void)
-{
-    struct UnkMauvilleOldManStruct2 *oldMan = &gSaveBlock1.oldMan.oldMan2;
-
-    if(oldMan->unk1 == 0)
-        sub_80F7DC0();
-
-    if(oldMan->mauvilleOldMan_ecArray[oldMan->unk1] != 0xFFFF) // is not the last element of the array?
-    {
-        u8 *stringPtr;
-        u32 random = Random();
-
-        random %= 8;
-        stringPtr = sub_80EB3FC(gStringVar4, oldMan->mauvilleOldMan_ecArray[oldMan->unk1]);
-        stringPtr = StringCopy(stringPtr, gOtherText_Is);
-        stringPtr = StringCopy(stringPtr, (u8 *)gUnknown_083E5388[random]);
-        StringCopy(stringPtr, gOtherText_DontYouAgree);
-    }
-    else
-    {
-        StringCopy(gStringVar4, (u8 *)gUnknown_083E53A8[oldMan->mauvilleOldMan_ecArray2[oldMan->unk2++]]);
-    }
-    if(!(Random() % 10))
-        oldMan->unk1 = 10;
-    else
-        oldMan->unk1++;
-
-    gScriptResult = TRUE;
-}
diff --git a/src/new_game.c b/src/new_game.c
index 226ac9bb7..46df14acd 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -11,7 +11,7 @@
 #include "item_menu.h"
 #include "lottery_corner.h"
 #include "mail_data.h"
-#include "mauville_old_man.h"
+#include "mauville_man.h"
 #include "play_time.h"
 #include "player_pc.h"
 #include "pokeblock.h"
@@ -157,7 +157,7 @@ void NewGameInitData(void)
     ClearPokeblocks();
     ClearDecorationInventories();
     InitEasyChatPhrases();
-    SetMauvilleOldMan();
+    SetupMauvilleOldMan();
     InitDewfordTrend();
     ResetFanClub();
     ResetLotteryCorner();
diff --git a/src/record_mixing.c b/src/record_mixing.c
index d1083910c..30bcb29d1 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -10,7 +10,7 @@
 #include "items.h"
 #include "load_save.h"
 #include "link.h"
-#include "mauville_old_man.h"
+#include "mauville_man.h"
 #include "menu.h"
 #include "mystery_event_script.h"
 #include "rng.h"
@@ -40,7 +40,7 @@ static u8 gUnknown_0300071C[4];
 void *recordMixingSecretBases = &gSaveBlock1.secretBases;
 void *recordMixingTvShows = &gSaveBlock1.tvShows;
 void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
-void *gUnknown_083D0278 = &gSaveBlock1.oldMan;
+void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
 struct RecordMixing_UnknownStruct *gUnknown_083D0280 = &gUnknown_02038738;
 void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
diff --git a/src/strings.c b/src/strings.c
index 219c5bec1..6c8dce9d6 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -861,7 +861,7 @@ const u8 gOtherText_AtBattleStart[] = _("At the battle’s start.");
 const u8 gOtherText_UponWinningBattle[] = _("Upon winning a battle.");
 const u8 gOtherText_UponLosingBattle[] = _("Upon losing a battle.");
 
-// mauville_old_man?
+// mauville_man?
 const u8 gOtherText_TheBardsSong[] = _("The BARD’s Song");
 const u8 gOtherText_WhatsHipHappening[] = _("What’s hip and happening?");
 const u8 gOtherText_Interview[] = _("Interview");
@@ -1781,7 +1781,7 @@ const u8 gOtherText_AtBattleStart[] = _("Zum Kampfbeginn");
 const u8 gOtherText_UponWinningBattle[] = _("Über den Sieg");
 const u8 gOtherText_UponLosingBattle[] = _("Über die Niederlage");
 
-// mauville_old_man?
+// mauville_man?
 const u8 gOtherText_TheBardsSong[] = _("Das BARDEN-Lied");
 const u8 gOtherText_WhatsHipHappening[] = _("Was ist hip? Was ist top?");
 const u8 gOtherText_Interview[] = _("Interview");
diff --git a/src/trader.c b/src/trader.c
index ea06058e9..61f48fad8 100644
--- a/src/trader.c
+++ b/src/trader.c
@@ -3,6 +3,7 @@
 #include "decoration_inventory.h"
 #include "event_data.h"
 #include "main.h"
+#include "mauville_man.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "script.h"
@@ -36,7 +37,7 @@ void sub_810993C(void)
 {
     u8 i, j;
     u8 buffer[12];
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 3; i++)
     {
@@ -55,13 +56,13 @@ void sub_810993C(void)
     }
 }
 
-void sub_81099CC(void)
+void TraderSetup(void)
 {
     u8 i;
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
-    trader->unk0 = 2;
-    trader->unk31 = 0;
+    trader->id = MAUVILLE_MAN_TRADER;
+    trader->alreadyTraded = FALSE;
 
     for (i = 0; i < 4; i++)
     {
@@ -74,8 +75,8 @@ void sub_81099CC(void)
 
 void sub_8109A20(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
-    trader->unk31 = 0;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
+    trader->alreadyTraded = FALSE;
 }
 
 void sub_8109A30(u8 value)
@@ -83,12 +84,12 @@ void sub_8109A30(u8 value)
     VarSet(VAR_RECYCLE_GOODS, value);
 }
 
-void sub_8109A48(u8 taskId)
+void CreateAvailableDecorationsMenu(u8 taskId)
 {
     u8 i;
     u8 numChoices = 1;
     u8 numDecorations = 0;
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     for (i = 0; i < 4; i++)
     {
@@ -139,9 +140,9 @@ void sub_8109B34(u8 taskId, u8 decorationId)
     EnableBothScriptContexts();
 }
 
-void sub_8109B7C(u8 taskId)
+void Task_HandleGetDecorationMenuInput(u8 taskId)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     if (gMain.newKeys & DPAD_UP)
     {
@@ -174,13 +175,13 @@ void sub_8109B7C(u8 taskId)
     }
 }
 
-void sub_8109C44(void)
+void ScrSpecial_GetTraderTradedFlag(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
-    gScriptResult = trader->unk31;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
+    gScriptResult = trader->alreadyTraded;
 }
 
-void sub_8109C58(void)
+void ScrSpecial_DoesPlayerHaveNoDecorations(void)
 {
     u8 i;
 
@@ -195,7 +196,7 @@ void sub_8109C58(void)
     gScriptResult = TRUE;
 }
 
-void sub_8109C90(void)
+void ScrSpecial_IsDecorationFull(void)
 {
     gScriptResult = FALSE;
     if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
@@ -206,7 +207,7 @@ void sub_8109C90(void)
     }
 }
 
-void sub_8109CF0(void)
+void ScrSpecial_TraderMenuGiveDecoration(void)
 {
     CreateTask(sub_80FE7A8, 0);
 }
@@ -242,20 +243,20 @@ void sub_8109DAC(u8 taskId)
     EnableBothScriptContexts();
 }
 
-void sub_8109DE0(void)
+void ScrSpecial_TraderDoDecorationTrade(void)
 {
-    struct MauvilleOldManTrader *trader = &gSaveBlock1.oldMan.trader;
+    struct MauvilleManTrader *trader = &gSaveBlock1.mauvilleMan.trader;
 
     sub_81340A8(gSpecialVar_0x8006);
     IsThereStorageSpaceForDecoration(gSpecialVar_0x8004);
     StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2.playerName);
     trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006;
     sub_810993C();
-    trader->unk31 = 1;
+    trader->alreadyTraded = TRUE;
 }
 
-void sub_8109E34(void)
+void ScrSpecial_TraderMenuGetDecoration(void)
 {
-    u8 taskId = CreateTask(sub_8109B7C, 0);
-    sub_8109A48(taskId);
+    u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
+    CreateAvailableDecorationsMenu(taskId);
 }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 626c5a7bf..e64ec1c86 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -509,7 +509,7 @@ static void sub_8093688(void)
     ewram0.var_5 = 0;
     ewram0.var_6 = 0;
     for (i = 0; i < 4; i++)
-        sub_80EB3FC(ewram0.var_20[i], ewram0.var_64.var_28[i]);
+        EasyChat_GetWordText(ewram0.var_20[i], ewram0.var_64.var_28[i]);
     sub_80936D4();
 }
 
diff --git a/src/tv.c b/src/tv.c
index a254bcd5f..996709209 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -388,7 +388,7 @@ bool8 GabbyAndTyGetLastQuote(void)
     if (gSaveBlock1.gabbyAndTyData.quote == 0xffff)
         return FALSE;
 
-    sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
+    EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
     gSaveBlock1.gabbyAndTyData.quote |= 0xffff;
     return TRUE;
 }
@@ -1624,7 +1624,7 @@ void sub_80BF79C(TVShow *arg0)
             break;
         i++;
     }
-    sub_80EB3FC(gStringVar3, arg0->recentHappenings.var04[i]);
+    EasyChat_GetWordText(gStringVar3, arg0->recentHappenings.var04[i]);
 }
 
 u8 sub_80BF7E8(struct TVShowNameRaterShow *arg0)
@@ -2575,20 +2575,20 @@ void DoTVShowBravoTrainerPokemonProfile(void)
         break;
     case 3:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
-        sub_80EB3FC(gStringVar2, bravoTrainer->var04[0]);
+        EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]);
         sub_80BF088(2, bravoTrainer->contestResult + 1);
         gUnknown_020387E8 = 5;
         break;
     case 4:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
-        sub_80EB3FC(gStringVar2, bravoTrainer->var04[0]);
+        EasyChat_GetWordText(gStringVar2, bravoTrainer->var04[0]);
         sub_80BF088(2, bravoTrainer->contestResult + 1);
         gUnknown_020387E8 = 5;
         break;
     case 5:
         TVShowConvertInternationalString(gStringVar1, bravoTrainer->playerName, bravoTrainer->language);
         CopyContestCategoryToStringVar(1, bravoTrainer->contestCategory);
-        sub_80EB3FC(gStringVar3, bravoTrainer->var04[1]);
+        EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]);
         if (bravoTrainer->var14)
             gUnknown_020387E8 = 6;
         else
@@ -2597,7 +2597,7 @@ void DoTVShowBravoTrainerPokemonProfile(void)
     case 6:
         StringCopy(gStringVar1, gSpeciesNames[bravoTrainer->species]);
         StringCopy(gStringVar2, gMoveNames[bravoTrainer->var14]);
-        sub_80EB3FC(gStringVar3, bravoTrainer->var04[1]);
+        EasyChat_GetWordText(gStringVar3, bravoTrainer->var04[1]);
         gUnknown_020387E8 = 7;
         break;
     case 7:
@@ -2680,7 +2680,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
         gUnknown_020387E8 = 11;
         break;
     case 11:
-        sub_80EB3FC(gStringVar1, bravoTrainerTower->var18[0]);
+        EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         if (bravoTrainerTower->var1b == 0)
             gUnknown_020387E8 = 12;
         else
@@ -2688,7 +2688,7 @@ void DoTVShowBravoTrainerBattleTowerProfile(void)
         break;
     case 12:
     case 13:
-        sub_80EB3FC(gStringVar1, bravoTrainerTower->var18[0]);
+        EasyChat_GetWordText(gStringVar1, bravoTrainerTower->var18[0]);
         TVShowConvertInternationalString(gStringVar2, bravoTrainerTower->trainerName, bravoTrainerTower->language);
         TVShowConvertInternationalString(gStringVar3, bravoTrainerTower->pokemonName, bravoTrainerTower->language);
         gUnknown_020387E8 = 14;
@@ -3106,12 +3106,12 @@ void DoTVShowPokemonFanClubOpinions(void)
     case 3:
         TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language);
         StringCopy(gStringVar2, gSpeciesNames[fanclubOpinions->var02]);
-        sub_80EB3FC(gStringVar3, fanclubOpinions->var1C[0]);
+        EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[0]);
         gUnknown_020387E8 = 4;
         break;
     case 4:
         TVShowConvertInternationalString(gStringVar1, fanclubOpinions->playerName, fanclubOpinions->language);
-        sub_80EB3FC(gStringVar3, fanclubOpinions->var1C[1]);
+        EasyChat_GetWordText(gStringVar3, fanclubOpinions->var1C[1]);
         TVShowDone();
         break;
     }
@@ -3176,7 +3176,7 @@ void DoTVShowInSearchOfTrainers(void)
         gUnknown_020387E8 = 8;
         break;
     case 8:
-        sub_80EB3FC(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
+        EasyChat_GetWordText(gStringVar1, gSaveBlock1.gabbyAndTyData.quote);
         StringCopy(gStringVar2, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon1]);
         StringCopy(gStringVar3, gSpeciesNames[gSaveBlock1.gabbyAndTyData.mon2]);
         gScriptResult = 1;