actually fix build

5 files changed, 34 insertions, 34 deletions

diff --git a/data-de/text/storyteller.inc b/data-de/text/storyteller.inc
index 5a07d73cc..abcc8a4a8 100644
--- a/data-de/text/storyteller.inc
+++ b/data-de/text/storyteller.inc
@@ -4,22 +4,22 @@ gTextStoryteller_Introduction:: @ 81AECC6
 	.string "legendären TRAINERN.\p"
 	.string "Soll ich dir etwas erzählen?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
+gTextStoryteller_OhIFeelStifled:: @ 81AED1D
 	.string "Oh...\n"
 	.string "Keiner mag mich...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
+gTextStoryteller_WhichTale:: @ 81AED35
 	.string "Ich kenne viele dieser Legenden.\n"
 	.string "Welche möchtest du hören?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
+gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
 	.string "Aber ich weiß nichts über legendäre\n"
 	.string "TRAINER. Also habe ich keine Ge-\l"
 	.string "schichte auf Lager.\p"
 	.string "Wo findet man wohl einen TRAINER, der\n"
 	.string "einer lebenden Legende gleicht?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
+gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
 	.string "Was ist?\n"
 	.string "Du... Du...\p"
 	.string "{STR_VAR_2}\n"
@@ -27,28 +27,28 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
 	.string "Das ist einfach großartig!\n"
 	.string "Die Geburt einer neuen Legende!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
+gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
 	.string "Ich überlege, ob es nicht noch andere\n"
 	.string "TRAINER gibt, die mir beeindruckende\l"
 	.string "Geschichten erzählen können.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
+gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
 	.string "Bist du ein TRAINER?\p"
 	.string "Dann sag mir, ob du Geschichten\n"
 	.string "für mich hast, die legendär sind?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
+gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
 	.string "Übrigens... Möchtest du eine weitere\n"
 	.string "legendäre Geschichte hören?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
+gTextStoryteller_ImNotSatisfied:: @ 81AEF49
 	.string "Hmm...\n"
 	.string "Ich bin nicht zufrieden...\p"
 	.string "Ich wünschte, du würdest mir Neuig-\n"
 	.string "keiten erzählen, die den Titel Legende\l"
 	.string "verdienen.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
+gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
 	.string "Ich wollte, mehr Leute würden sich für\n"
 	.string "meine epischen Geschichten über\l"
 	.string "legendäre TRAINER interessieren.$"
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 780017442..6a8f5f051 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -204,13 +204,13 @@ speak_to_storyteller:: @ 81B0816
 	faceplayer
 	msgbox gTextStoryteller_Introduction, MSGBOX_YESNO
 	compare RESULT, NO
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
+	jumpeq dont_hear_tale
 	specialval RESULT, sub_80F889C
 	compare RESULT, 0
 	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F
-	message MauvilleCity_PokemonCenter_1F_Text_1AED35
+	message gTextStoryteller_WhichTale
 	waittext
 	special sub_80F8874
 	waitstate
@@ -227,12 +227,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883
 	compare 0x8008, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
+	jumpeq dont_hear_tale
 	jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO
+	msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4
+	msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO
 	compare RESULT, 1
 	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F
 
@@ -246,34 +246,34 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE
 	jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4
+	msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO
+	msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO
 	compare RESULT, 0
-	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914
+	jumpeq dont_hear_tale
 	specialval RESULT, sub_80F88FC
 	compare RESULT, 1
 	jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4
+	msgbox gTextStoryteller_ImNotSatisfied, 4
 	closebutton
 	release
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4
+	msgbox gTextStoryteller_BirthOfANewLegend, 4
 	closebutton
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4
+dont_hear_tale:: @ 81B0914
+	msgbox gTextStoryteller_OhIFeelStifled, 4
 	closebutton
 	release
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4
+	msgbox gTextStoryteller_WishMorePeopleWould, 4
 	closebutton
 	release
 	end
diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc
index ad131ec54..437a1fa21 100644
--- a/data/text/storyteller.inc
+++ b/data/text/storyteller.inc
@@ -4,21 +4,21 @@ gTextStoryteller_Introduction:: @ 81AECC6
 	.string "TRAINERS.\p"
 	.string "Will you hear my tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
+gTextStoryteller_OhIFeelStifled:: @ 81AED1D
 	.string "Oh...\n"
 	.string "I feel stifled...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
+gTextStoryteller_WhichTale:: @ 81AED35
 	.string "I know of these legends.\n"
 	.string "Which tale will you have me tell?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
+gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
 	.string "But, I know of no legendary TRAINERS.\n"
 	.string "Hence, I know no tales.\p"
 	.string "Where does one find a TRAINER worthy\n"
 	.string "of a legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
+gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
 	.string "What’s that?!\n"
 	.string "You... You...\p"
 	.string "{STR_VAR_2}\n"
@@ -26,27 +26,27 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
 	.string "That is indeed magnificent!\n"
 	.string "It’s the birth of a new legend!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
+gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
 	.string "It gets me thinking, could there be\n"
 	.string "other TRAINERS with more impressive\l"
 	.string "legends awaiting discovery?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
+gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
 	.string "Are you a TRAINER?\p"
 	.string "Then tell me, have you any tales that\n"
 	.string "are even remotely legendary?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
+gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
 	.string "Incidentally... Would you care to hear\n"
 	.string "another legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
+gTextStoryteller_ImNotSatisfied:: @ 81AEF49
 	.string "Hmm...\n"
 	.string "I’m not satisfied...\p"
 	.string "I wish you would bring me news worthy\n"
 	.string "of being called a legend.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
+gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
 	.string "I wish more people would be interested\n"
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
diff --git a/src/bard_music.c b/src/bard_music.c
index 5b7419735..da628867b 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -37,7 +37,7 @@ struct BardSound *GetWordSounds(u16 group, u16 word)
 }
 #endif
 
-s32 GetWordPhonemes(struct BardSong *song, struct BardSound *src, u16 arg2)
+s32 GetWordPhonemes(struct BardSong *song, const struct BardSound *src, u16 arg2)
 {
     s32 i;
     s32 j;
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index c8bbf8c86..9e392a65a 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -797,6 +797,7 @@ void BardSingWord(struct Task *task, struct BardSong *song)
             for (i = 0; i < 6; i++)
                 song->lyrics[i] = lyrics[i];
             
+            // Clear phonemes
             for (i = 0; i < 6; i++)
             {
                 song->phonemes[i].sound = 0xFFFF;
@@ -814,7 +815,6 @@ void BardSingWord(struct Task *task, struct BardSong *song)
     case 2:  // Initialize word
         {
             u16 word = song->lyrics[song->currWord];
-            // TODO: fix this return type
             const struct BardSound *sounds = GetWordSounds(EC_GROUP(word), EC_INDEX(word));
 
             song->var04 = 0;
@@ -973,7 +973,7 @@ void Task_BardSong(u8 taskId)
         }
         else if (gStringVar4[task->tCharIndex] == CHAR_SONG_WORD_SEPARATOR)
         {
-            gStringVar4[task->tCharIndex] = CHAR_SPACE;
+            gStringVar4[task->tCharIndex] = CHAR_SPACE;  // restore it back to a space
             sub_8003418(gMenuWindowPtr);
             task->tCharIndex++;
             task->data[2] = 0;