diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bard_music.h | 41 | ||||
| -rw-r--r-- | include/easy_chat.h | 2 |
2 files changed, 42 insertions, 1 deletions
diff --git a/include/bard_music.h b/include/bard_music.h new file mode 100644 index 000000000..912201853 --- /dev/null +++ b/include/bard_music.h @@ -0,0 +1,41 @@ +#ifndef GUARD_BARD_MUSIC_H +#define GUARD_BARD_MUSIC_H + +// Exported type declarations + + +struct BardSound +{ + /*0x00*/ u8 var00; + /*0x01*/ s8 var01; + /*0x02*/ u16 var02; + /*0x04*/ u16 volume; + /*0x06*/ u16 var06; +}; + +struct BardPhoneme +{ + /*0x00*/ u16 length; + /*0x02*/ u16 pitch; +}; + +struct BardSong +{ + /*0x00*/ u8 currWord; + /*0x01*/ u8 currPhoneme; + /*0x02*/ u8 phonemeTimer; + /*0x03*/ u8 state; + /*0x04*/ s16 length; + /*0x06*/ u16 volume; + /*0x08*/ s16 pitch; + /*0x0A*/ s16 voiceInflection; + /*0x0C*/ u16 lyrics[6]; + /*0x18*/ struct BardPhoneme phonemes[6]; + /*0x30*/ const struct BardSound *sound; +}; + +// Exported RAM declarations + +// Exported ROM declarations + +#endif //GUARD_BARD_MUSIC_H diff --git a/include/easy_chat.h b/include/easy_chat.h index 7e816db34..44aa3f7fa 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -34,6 +34,6 @@ void CopyEasyChatWord(u8 *dest, u16 word); bool32 sub_811F8D8(u16 word); void InitializeEasyChatWordArray(u16 *words, u16 length); void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); -bool8 sub_811EB10(u16 word); +bool8 IsECWordInValidRange(u16 word); #endif // GUARD_EASYCHAT_H |