diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-01 14:59:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 14:59:45 -0500 |
| commit | 90513a9d726e6cda19a3f8fdc8988ee31d9f4ff1 (patch) | |
| tree | 222557193014edeffd90a19a16e97a5e03193440 /include | |
| parent | 740c0a6bc1f9817215c4efe2eeb3b7fbe0e260fb (diff) | |
| parent | 12af03cd62732bd63c0bc482d63f59ee97bc17f2 (diff) | |
Merge pull request #1318 from GriffinRichards/bardmoves
Minor bard music clean up
Diffstat (limited to 'include')
| -rw-r--r-- | include/bard_music.h | 11 | ||||
| -rw-r--r-- | include/easy_chat.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/include/bard_music.h b/include/bard_music.h index 882606b27..2825d16e6 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -1,9 +1,6 @@ #ifndef GUARD_BARD_MUSIC_H #define GUARD_BARD_MUSIC_H -// Exported type declarations - - struct BardSound { /*0x00*/ u8 var00; @@ -34,12 +31,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); |