From 9ee6622f83e4177761f93546a43e305de24c4d4c Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 30 Jul 2019 19:46:54 -0700 Subject: Start bard_music synchronization. --- include/bard_music.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'include/bard_music.h') diff --git a/include/bard_music.h b/include/bard_music.h index 529fd50f8..ee8a5f80b 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); +// Exported RAM declarations + +// Exported ROM declarations + +const struct BardSound *GetWordSounds(u16 group, u16 word); s32 GetWordPhonemes(struct BardSong *dest, const struct BardSound *src, u16 arg2); #endif // GUARD_BARD_MUSIC_H -- cgit v1.2.3 From dee6732764d7a6b41027bb2756557a8638e73c22 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 31 Jul 2019 00:01:20 -0700 Subject: Finish synchronizing bard_music data organization. --- include/bard_music.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/bard_music.h') diff --git a/include/bard_music.h b/include/bard_music.h index ee8a5f80b..6e9d802e6 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -40,6 +40,6 @@ struct BardSong // Exported ROM declarations const struct BardSound *GetWordSounds(u16 group, u16 word); -s32 GetWordPhonemes(struct BardSong *dest, const struct BardSound *src, u16 arg2); +s32 GetWordPhonemes(struct BardSong *dest, const struct BardSound *src, u16 word); #endif // GUARD_BARD_MUSIC_H -- cgit v1.2.3