more labeling

9 files changed, 180 insertions, 169 deletions

diff --git a/include/bard_music.h b/include/bard_music.h
index 8b547ff39..d0cb49ace 100644
--- a/include/bard_music.h
+++ b/include/bard_music.h
@@ -11,33 +11,33 @@ struct UnkBard
     /*0x00*/ u8 var00;
     /*0x01*/ s8 var01;
     /*0x02*/ u16 var02;
-    /*0x04*/ u16 var04;
+    /*0x04*/ u16 volume;
     /*0x06*/ u16 var06;
 };
 
-struct UnkBard3
+struct BardPhoneme
 {
-    /*0x00*/ u16 var00;
-    /*0x02*/ u16 var02;
-    /*0x04*/ s16 var04;
-    /*0x06*/ u16 var06;
+    /*0x00*/ u16 sound;
+    /*0x02*/ u16 length;
+    /*0x04*/ s16 pitch;
+    /*0x06*/ u16 volume;
 };
 
-struct UnkBard2
+struct BardSong
 {
-    /*0x00*/ u8 var00;
-    /*0x01*/ u8 var01;
-    /*0x02*/ u8 var02;
-    /*0x03*/ u8 var03;
+    /*0x00*/ u8 currWord;
+    /*0x01*/ u8 currPhoneme;
+    /*0x02*/ u8 phonemeTimer;
+    /*0x03*/ u8 state;
     /*0x04*/ s16 var04;
     /*0x06*/ u16 volume;
     /*0x08*/ s16 pitch;
-    /*0x0A*/ s16 var0A;
-    /*0x0C*/ u16 var0C[6];
-    /*0x18*/ struct UnkBard3 var18[6];
+    /*0x0A*/ s16 voiceInflection;
+    /*0x0C*/ u16 lyrics[6];
+    /*0x18*/ struct BardPhoneme phonemes[6];
 };
 
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1);
-s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2);
+struct UnkBard *GetWordSoundInfo(u16 arg0, u16 arg1);
+s32 GetWordPhonemes(struct BardSong *dest, struct UnkBard *src, u16 arg2);
 
 #endif  // GUARD_BARD_MUSIC_H
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 03e9bb737..614dce50d 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -26,6 +26,8 @@ enum {
     EC_GROUP_POKEMON_2,
 };
 
+#define EC_GROUP(word) ((word) >> 9)
+#define EC_INDEX(word) ((word) & 0x1FF)
 
 u16 sub_80EB72C(u16 group);
 void sub_80EB6FC(u16 *, u16);
@@ -33,7 +35,7 @@ void InitEasyChatPhrases(void);
 u8 sub_80EAD7C(u8 group);
 u16 sub_80EAE88(u8);
 u8 sub_80EB37C(u16);
-u8* sub_80EB3FC(u8 *, u16);
+u8* EasyChat_GetWordText(u8 *, u16);
 u8 *ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16);
 u16 sub_80EB784(u16 group);
 u8 sub_80EB868(u8);
diff --git a/include/text.h b/include/text.h
index 99987d2c3..022c65fb9 100644
--- a/include/text.h
+++ b/include/text.h
@@ -2,6 +2,7 @@
 #define GUARD_TEXT_H
 
 #define CHAR_SPACE          0x00
+#define CHAR_SONG_WORD_SEPARATOR 0x37  // separates words in the bard song. Not sure if it's used for anything else
 #define CHAR_0              0xA1
 #define CHAR_QUESTION_MARK  0xAC
 #define CHAR_PERIOD         0xAD
diff --git a/src/bard_music.c b/src/bard_music.c
index ce2a1e9ec..593376f35 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -2,36 +2,33 @@
 #include "bard_music.h"
 #include "easy_chat.h"
 
-extern struct BardSound *gBardMusicTable[];
+extern struct UnkBard (*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)
+struct UnkBard *GetWordSoundInfo(u16 group, u16 word)
 {
-    struct BardSound *sounds = gBardMusicTable[arg0];
+    struct UnkBard (*sounds)[][6] = gBardMusicTable[group];
 
-    return &sounds[arg1];
+    return (*sounds)[word];
 }
 #elif GERMAN
-struct BardSound *sub_814A2D0(u16 arg0, u16 arg1)
+struct UnkBard *GetWordSoundInfo(u16 group, u16 word)
 {
-    u32 index;
-    struct BardSound *sounds;
+    struct UnkBard (*sounds)[][6] = gBardMusicTable[group];
+    u32 index = de_sub_80EB748(group, word);
 
-    sounds = gBardMusicTable[arg0];
-    index = de_sub_80EB748(arg0, arg1);
-
-    return &sounds[index];
+    return (*sounds)[index];
 }
 #endif
 
-s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2)
+s32 GetWordPhonemes(struct BardSong *song, struct UnkBard *src, u16 arg2)
 {
     s32 i;
     s32 j;
@@ -39,25 +36,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 r1 = 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 = r1;
+            song->phonemes[i].volume = src[i].volume;
+            song->var04 += r1;
         }
     }
 
     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 e0073d8d8..8fae62872 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -19,7 +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;
@@ -31,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
@@ -58,7 +59,7 @@ u8 *sub_80EB3FC(u8 *dst, u16 word)
             dst = StringCopy(dst, src);
             break;
         }
-        dst[0] = EOS;
+        *dst = EOS;
         return dst;
     }
 }
@@ -76,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)
             {
@@ -89,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++;
@@ -114,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)
             {
@@ -127,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;
@@ -152,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
@@ -320,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/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_old_man.c b/src/mauville_old_man.c
index e5d661e4a..3cf5265c0 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -133,7 +133,7 @@ extern const u8 gTextStoryteller_Story36Title[];
 extern const u8 gTextStoryteller_Story36Action[];
 extern const u8 gTextStoryteller_Story36Text[];
 
-extern struct UnkBard2 gUnknown_03005DA0;
+extern struct BardSong gUnknown_03005DA0;
 
 extern u16 gUnknown_020388BC;  // set but not used?
 
@@ -248,7 +248,7 @@ void SetupMauvilleOldMan(void)
     sub_80F83D0();
 }
 
-//#define TEST MAUVILLE_MAN_STORYTELLER
+//#define TEST MAUVILLE_MAN_BARD
 
 #ifdef TEST
 // Safely changes man to test functionality
@@ -319,52 +319,58 @@ void ScrSpecial_SaveBardSongLyrics(void)
     bard->hasChangedSong = TRUE;
 }
 
-// prepare song?
-void sub_80F7BA0(void)
+// 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 i;
-    u8 *ptr;
-    u8 *r4;
+    u16 lineNum;
+    u8 *wordEnd;
+    u8 *str;
 
     lyrics = bard->temporaryLyrics;
     if (specialVar == 0)
         lyrics = bard->songLyrics;
-    ptr = gStringVar4;
-    r4 = ptr;
-    for (i = 0; i < 2; i++)
+    wordEnd = gStringVar4;
+    str = wordEnd;
+    // Put three words on each line
+    for (lineNum = 0; lineNum < 2; lineNum++)
     {
-        ptr = sub_80EB3FC(ptr, *(lyrics++));
-        while (ptr != r4)
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
         {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
         }
-        r4++;
-        *(ptr++) = CHAR_SPACE;
-        ptr = sub_80EB3FC(ptr, *(lyrics++));
-        while (ptr != r4)
+        
+        str++;
+        *(wordEnd++) = CHAR_SPACE;
+        
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
         {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
         }
-        r4++;
-        *(ptr++) = CHAR_NEWLINE;
-        ptr = sub_80EB3FC(ptr, *(lyrics++));
-        while (ptr != r4)
+        
+        str++;
+        *(wordEnd++) = CHAR_NEWLINE;
+        
+        wordEnd = EasyChat_GetWordText(wordEnd, *(lyrics++));
+        while (wordEnd != str)
         {
-            if (*r4 == 0)
-                *r4 = 0x37;
-            r4++;
+            if (*str == CHAR_SPACE)
+                *str = CHAR_SONG_WORD_SEPARATOR;
+            str++;
         }
-        if (i == 0)
+        
+        if (lineNum == 0)
         {
-            *(ptr++) = EXT_CTRL_CODE_BEGIN;
-            *(ptr++) = 0xF;
+            *(wordEnd++) = EXT_CTRL_CODE_BEGIN;
+            *(wordEnd++) = 15;
         }
     }
 }
@@ -401,7 +407,7 @@ void ScrSpecial_HipsterTeachWord(void)
     }
     else
     {
-        sub_80EB3FC(gStringVar1, var);
+        EasyChat_GetWordText(gStringVar1, var);
         gScriptResult = TRUE;
     }
 }
@@ -434,7 +440,7 @@ void ScrSpecial_GenerateGiddyLine(void)
         u32 adjective = Random();
 
         adjective %= 8;
-        stringPtr = sub_80EB3FC(gStringVar4, giddy->mauvilleOldMan_ecArray[giddy->unk1]);
+        stringPtr = EasyChat_GetWordText(gStringVar4, giddy->mauvilleOldMan_ecArray[giddy->unk1]);
         stringPtr = StringCopy(stringPtr, gOtherText_Is);
         stringPtr = StringCopy(stringPtr, gGiddyAdjectives[adjective]);
         StringCopy(stringPtr, gOtherText_DontYouAgree);
@@ -761,105 +767,112 @@ void sub_80F7F30(void)
     sub_80F83D0();
 }
 
-void StartBardSong(u8 a)
+#define tState data[0]
+#define tCharIndex data[3]
+#define tCurrWord data[4]
+#define tUseTemporaryLyrics data[5]
+
+void StartBardSong(bool8 useTemporaryLyrics)
 {
     u8 taskId = CreateTask(Task_BardSong, 0x50);
 
-    gTasks[taskId].data[5] = a;
+    gTasks[taskId].tUseTemporaryLyrics = useTemporaryLyrics;
 }
 
-void BardSingWord(struct Task *task, struct UnkBard2 *b)
+void BardSingWord(struct Task *task, struct BardSong *song)
 {
-    switch (task->data[0])
+    switch (task->tState)
     {
-    case 0:
+    case 0:  // Initialize song
         {
             struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
-            u16 *r2;
+            u16 *lyrics;
             s32 i;
 
+            // Copy lyrics
             if (gSpecialVar_0x8004 == 0)
-                r2 = bard->songLyrics;
+                lyrics = bard->songLyrics;
             else
-                r2 = bard->temporaryLyrics;
+                lyrics = bard->temporaryLyrics;
             for (i = 0; i < 6; i++)
-                b->var0C[i] = r2[i];
+                song->lyrics[i] = lyrics[i];
+            
             for (i = 0; i < 6; i++)
             {
-                b->var18[i].var00 = 0xFFFF;
-                b->var18[i].var02 = 0;
-                b->var18[i].var04 = 0;
-                b->var18[i].var06 = 0;
+                song->phonemes[i].sound = 0xFFFF;
+                song->phonemes[i].length = 0;
+                song->phonemes[i].pitch = 0;
+                song->phonemes[i].volume = 0;
             }
-            b->var00 = 0;
-            b->var01 = 0;
-            b->var04 = 0;
+            song->currWord = 0;
+            song->currPhoneme = 0;
+            song->var04 = 0;
         }
         break;
-    case 1:
+    case 1:  // Wait for BGM to end
         break;
-    case 2:
+    case 2:  // Initialize word
         {
-            u16 r4 = b->var0C[b->var00];
+            u16 word = song->lyrics[song->currWord];
             // TODO: fix this return type
-            struct UnkBard *r1 = (struct UnkBard *)sub_814A2D0(r4 / 0x200, r4 % 0x200);
+            struct UnkBard *sounds = GetWordSoundInfo(EC_GROUP(word), EC_INDEX(word));
 
-            b->var04 = 0;
-            sub_814A2EC(b, r1, (r4 % 4) + ((r4 / 8) & 1));
+            song->var04 = 0;
+            GetWordPhonemes(song, r1, MACRO1(word));
         }
         break;
     case 3:
     case 4:
         {
-            struct UnkBard3 *r7 = &b->var18[b->var01];
+            struct BardPhoneme *phoneme = &song->phonemes[song->currPhoneme];
 
-            switch (b->var03)
+            switch (song->state)
             {
             case 0:
-                if (b->var02 == 0)
+                if (song->phonemeTimer == 0)  // Timer has expired. Move to next phoneme
                 {
-                    if (b->var01 == 6 || r7->var00 == 0xFF)
+                    if (song->currPhoneme == 6 || phoneme->sound == 0xFF)
                     {
-                        b->var03 = 0xFE;
+                        song->state = 0xFE;
                         break;
                     }
-                    b->var02 = r7->var02;
-                    if (r7->var00 <= 50)
+                    song->phonemeTimer = phoneme->length;
+                    if (phoneme->sound <= 50)
                     {
-                        u16 r1 = r7->var00 / 3;
+                        u16 num = phoneme->sound / 3;
 
-                        m4aSongNumStart(249 + r1 * 3);
+                        m4aSongNumStart(249 + num * 3);
                     }
-                    b->var03 = 1;
+                    song->state = 1;
                 }
                 else
                 {
-                    if (b->var0A > 10)
-                        b->volume -= 2;
-                    if (b->var0A & 1)
-                        b->pitch += 64;
+                    if (song->voiceInflection > 10)
+                        song->volume -= 2;
+                    if (song->voiceInflection & 1)
+                        song->pitch += 64;
                     else
-                        b->pitch -= 64;
-                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, b->volume);
-                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, b->pitch);
-                    b->var0A++;
+                        song->pitch -= 64;
+                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, song->volume);
+                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, song->pitch);
+                    song->voiceInflection++;
                 }
-                b->var02--;
+                song->phonemeTimer--;
                 break;
             case 1:
-                b->var01++;
-                b->var03 = 0;
-                if (r7->var00 <= 50)
+                song->currPhoneme++;
+                song->state = 0;
+                if (phoneme->sound <= 50)
                 {
-                    b->volume = 0x100 + r7->var06 * 16;
-                    m4aMPlayVolumeControl(&gMPlay_SE2, 0xFFFF, b->volume);
-                    b->pitch = 0x200 + r7->var04;
-                    m4aMPlayPitchControl(&gMPlay_SE2, 0xFFFF, b->pitch);
+                    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);
-                b->var03 = 0xFF;
+                song->state = 0xFF;
                 break;
             }
         }
@@ -869,9 +882,6 @@ void BardSingWord(struct Task *task, struct UnkBard2 *b)
     }
 }
 
-#define tState data[0]
-#define tCharIndex data[3]
-
 void Task_BardSong(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];  // r5
@@ -879,48 +889,48 @@ void Task_BardSong(u8 taskId)
     BardSingWord(task, &gUnknown_03005DA0);
     switch (task->tState)
     {
-    case 0:
-        sub_80F7BA0();
+    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->data[4] = 0;
+        task->tCurrWord = 0;
         FadeOutBGMTemporarily(4);
         task->tState = 1;
         break;
-    case 1:
+    case 1:  // Wait for BGM to end
         if (IsBGMPausedOrStopped())
             task->tState = 2;
         break;
-    case 2:
+    case 2:  // Initialize word
         {
             struct MauvilleManBard *bard = &gSaveBlock1.mauvilleMan.bard;
-            u8 *string = gStringVar4 + task->tCharIndex;
+            u8 *str = gStringVar4 + task->tCharIndex;
             u16 wordLen = 0;
             // Can't get it to match without hacking
             u32 temp;
             register s16 zero asm("r1");
 
-            while (*string != CHAR_SPACE
-                && *string != CHAR_NEWLINE
-                && *string != EXT_CTRL_CODE_BEGIN
-                && *string != EOS)
+            while (*str != CHAR_SPACE
+                && *str != CHAR_NEWLINE
+                && *str != EXT_CTRL_CODE_BEGIN
+                && *str != EOS)
             {
-                string++;
+                str++;
                 wordLen++;
             }
-            if (task->data[5] == 0)
-                gUnknown_020388BC = MACRO1(bard->songLyrics[task->data[4]]);
+            if (!task->tUseTemporaryLyrics)
+                gUnknown_020388BC = MACRO1(bard->songLyrics[task->tCurrWord]);
             else
-                gUnknown_020388BC = MACRO1(bard->temporaryLyrics[task->data[4]]);
+                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->data[4]++;
+            task->tCurrWord++;
             if (task->data[2] == 0)
                 task->tState = 3;
             else
@@ -961,7 +971,7 @@ void Task_BardSong(u8 taskId)
             task->tState = 2;
             task->data[2] = 8;
         }
-        else if (gStringVar4[task->tCharIndex] == 0x37)  // What is 0x37 supposed to be?
+        else if (gStringVar4[task->tCharIndex] == CHAR_SONG_WORD_SEPARATOR)
         {
             gStringVar4[task->tCharIndex] = CHAR_SPACE;
             sub_8003418(gMenuWindowPtr);
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;