diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-08-24 19:13:29 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-08-24 19:13:29 -0500 |
| commit | ded9b4a8d0a59dab3882ab3fe43817bc38bca834 (patch) | |
| tree | 6d1cad7ac8b3b9917f875d9b05f3192a3c571a8b /include/bard_music.h | |
| parent | 1b715eb7ba38ff408acf5e5e0a9ea88642f912bb (diff) | |
more labeling
Diffstat (limited to 'include/bard_music.h')
| -rw-r--r-- | include/bard_music.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/include/bard_music.h b/include/bard_music.h index 8b547ff39..d0cb49ace 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -11,33 +11,33 @@ struct UnkBard /*0x00*/ u8 var00; /*0x01*/ s8 var01; /*0x02*/ u16 var02; - /*0x04*/ u16 var04; + /*0x04*/ u16 volume; /*0x06*/ u16 var06; }; -struct UnkBard3 +struct BardPhoneme { - /*0x00*/ u16 var00; - /*0x02*/ u16 var02; - /*0x04*/ s16 var04; - /*0x06*/ u16 var06; + /*0x00*/ u16 sound; + /*0x02*/ u16 length; + /*0x04*/ s16 pitch; + /*0x06*/ u16 volume; }; -struct UnkBard2 +struct BardSong { - /*0x00*/ u8 var00; - /*0x01*/ u8 var01; - /*0x02*/ u8 var02; - /*0x03*/ u8 var03; + /*0x00*/ u8 currWord; + /*0x01*/ u8 currPhoneme; + /*0x02*/ u8 phonemeTimer; + /*0x03*/ u8 state; /*0x04*/ s16 var04; /*0x06*/ u16 volume; /*0x08*/ s16 pitch; - /*0x0A*/ s16 var0A; - /*0x0C*/ u16 var0C[6]; - /*0x18*/ struct UnkBard3 var18[6]; + /*0x0A*/ s16 voiceInflection; + /*0x0C*/ u16 lyrics[6]; + /*0x18*/ struct BardPhoneme phonemes[6]; }; -struct BardSound *sub_814A2D0(u16 arg0, u16 arg1); -s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2); +struct UnkBard *GetWordSoundInfo(u16 arg0, u16 arg1); +s32 GetWordPhonemes(struct BardSong *dest, struct UnkBard *src, u16 arg2); #endif // GUARD_BARD_MUSIC_H |