diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-08 12:40:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-08 12:40:12 -0400 |
| commit | 1d9088d2a8590694f3ddc0370873664c8e1612ca (patch) | |
| tree | 44441a1b62d3ff5c5305a489ee9d5fd5fec76b24 /include/bard_music.h | |
| parent | c33effb95c398eaf52a928a9ded51cc5e7e8f1e1 (diff) | |
| parent | dee6732764d7a6b41027bb2756557a8638e73c22 (diff) | |
Merge pull request #753 from ultima-soul/synchronize
Synchronize bard_music data organization with pokeemerald
Diffstat (limited to 'include/bard_music.h')
| -rw-r--r-- | include/bard_music.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/include/bard_music.h b/include/bard_music.h index 529fd50f8..6e9d802e6 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -1,7 +1,17 @@ #ifndef GUARD_BARD_MUSIC_H #define GUARD_BARD_MUSIC_H -struct BardSound; +// Exported type declarations + + +struct BardSound +{ + /*0x00*/ u8 var00; + /*0x01*/ s8 var01; + /*0x02*/ u16 var02; + /*0x04*/ s16 volume; + /*0x06*/ u16 var06; +}; struct BardPhoneme { @@ -25,7 +35,11 @@ struct BardSong /*0x18*/ struct BardPhoneme phonemes[6]; }; -const struct BardSound *GetWordSounds(u16 arg0, u16 arg1); -s32 GetWordPhonemes(struct BardSong *dest, const struct BardSound *src, u16 arg2); +// Exported RAM declarations + +// Exported ROM declarations + +const struct BardSound *GetWordSounds(u16 group, u16 word); +s32 GetWordPhonemes(struct BardSong *dest, const struct BardSound *src, u16 word); #endif // GUARD_BARD_MUSIC_H |