Index gBardSounds_Moves and gBardSounds_Pokemon with constants

2 files changed, 3 insertions, 7 deletions

diff --git a/include/bard_music.h b/include/bard_music.h
index 882606b27..ca4c285db 100644
--- a/include/bard_music.h
+++ b/include/bard_music.h
@@ -34,12 +34,8 @@ struct BardSong
     /*0x30*/ const struct BardSound *sound;
 };
 
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-extern const u16 gNumSpeciesNames;
-extern const u16 gUnknown_085FA1D4;
+extern const u16 gNumBardWords_Species;
+extern const u16 gNumBardWords_Moves;
 const struct BardSound *GetWordSounds(u16 word);
 void GetWordPhonemes(struct BardSong *song, u16 word);
 
diff --git a/include/easy_chat.h b/include/easy_chat.h
index f2ef066d4..2fa7f7b3e 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -127,7 +127,7 @@ u8 * CopyEasyChatWord(u8 *dest, u16 word);
 bool32 sub_811F8D8(int word);
 void InitializeEasyChatWordArray(u16 *words, u16 length);
 u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
-bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
+bool8 IsBardWordInvalid(u16 word);
 u16 GetRandomEasyChatWordFromGroup(u16 group);
 u16 GetNewHipsterPhraseToTeach(void);
 u16 EasyChat_GetNumWordsInGroup(u8);