diff --git a/include/bard_music.h b/include/bard_music.h index 2825d16e6..2942fa8e4 100644 --- a/include/bard_music.h +++ b/include/bard_music.h @@ -3,11 +3,11 @@ struct BardSound { - /*0x00*/ u8 var00; - /*0x01*/ s8 var01; - /*0x02*/ u16 var02; + /*0x00*/ u8 songLengthId; + /*0x01*/ s8 songLengthOffset; + /*0x02*/ u16 unused; /*0x04*/ s16 volume; - /*0x06*/ u16 var06; + /*0x06*/ u16 unused2; }; struct BardPhoneme diff --git a/src/bard_music.c b/src/bard_music.c index dd986371d..165b4fe77 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -51,9 +51,9 @@ void GetWordPhonemes(struct BardSong *song, u16 word) for (i = 0; i < 6; i ++) { sound = &song->sound[i]; - if (sound->var00 != 0xFF) + if (sound->songLengthId != 0xFF) { - song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00]; + song->phonemes[i].length = sound->songLengthOffset + gBardSoundLengthTable[sound->songLengthId]; song->phonemes[i].pitch = CalcWordPitch(word + 30, i); song->length += song->phonemes[i].length; } diff --git a/src/data/bard_music/actions.h b/src/data/bard_music/actions.h index 2015e322b..5acac3450 100644 --- a/src/data/bard_music/actions.h +++ b/src/data/bard_music/actions.h @@ -2,628 +2,628 @@ #define GUARD_DATA_BARD_MUSIC_ACTIONS_H const struct BardSound gBardSounds_Actions[][6] = { { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x6), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 6 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 8 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x5), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 5 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x2f), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 47 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x1a), - BARD_SOUND(0x2), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 26 }, + { .songLengthId = 2 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2f), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 47 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2f), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 47 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2f), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 47 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 38 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0x29), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 41 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x23), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 44 }, + { .songLengthId = 35 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 44 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x3), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 3 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/adjectives.h b/src/data/bard_music/adjectives.h index c6b3914b3..c86138d2c 100644 --- a/src/data/bard_music/adjectives.h +++ b/src/data/bard_music/adjectives.h @@ -2,292 +2,292 @@ #define GUARD_DATA_BARD_MUSIC_ADJECTIVES_H const struct BardSound gBardSounds_Adjectives[][6] = { { - BARD_SOUND(0x1d), - BARD_SOUND(0x32), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 50 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x24), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 36 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x8), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 8 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2d), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x5), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 5 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x32), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 50 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0x3), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 3 }, + { .songLengthId = 29 }, + { .songLengthId = 51 } } }; diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h index 9017d451b..291d22872 100644 --- a/src/data/bard_music/bard_sounds.h +++ b/src/data/bard_music/bard_sounds.h @@ -1,10 +1,7 @@ #ifndef GUARD_BARD_SOUNDS_TABLE_H #define GUARD_BARD_SOUNDS_TABLE_H -#define BARD_SOUND_FULL(var00, var01, var02) { var00, var01, var02, 0x0, 0x0 } -#define BARD_SOUND(var00) BARD_SOUND_FULL(var00, 0x0, 0x0) -#define BARD_SOUND_EMPTY BARD_SOUND(0x0) -#define BARD_SOUND_NULL BARD_SOUND(0xff) +#define NULL_BARD_SOUND { .songLengthId = 0xff } #include "pokemon.h" #include "moves.h" diff --git a/src/data/bard_music/battle.h b/src/data/bard_music/battle.h index 086ea50a6..c2cb57134 100644 --- a/src/data/bard_music/battle.h +++ b/src/data/bard_music/battle.h @@ -2,508 +2,508 @@ #define GUARD_DATA_BARD_MUSIC_BATTLE_H const struct BardSound gBardSounds_Battle[][6] = { { - BARD_SOUND(0x2), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x12), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 18 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x12), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 18 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 8 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xb), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 11 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x32), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 50 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 11 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x23), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 35 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x12), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 18 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x16), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 22 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x1a), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 26 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 41 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/conditions.h b/src/data/bard_music/conditions.h index 30ed9842f..c56421e63 100644 --- a/src/data/bard_music/conditions.h +++ b/src/data/bard_music/conditions.h @@ -2,556 +2,556 @@ #define GUARD_DATA_BARD_MUSIC_CONDITIONS_H const struct BardSound gBardSounds_Conditions[][6] = { { - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 11 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xb), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 11 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x6), - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 6 }, + { .songLengthId = 41 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 1 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1a), - BARD_SOUND(0xb), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 26 }, + { .songLengthId = 11 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1a), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 26 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x29), - BARD_SOUND(0xa), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 41 }, + { .songLengthId = 10 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x20), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 32 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x19), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 25 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x27), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 39 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x3), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 3 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0xb), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 11 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x14), - BARD_SOUND(0x23), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 20 }, + { .songLengthId = 35 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0xa), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 10 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x2a), - BARD_SOUND(0x1e), - BARD_SOUND(0x2c), - BARD_SOUND(0x26), - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 42 }, + { .songLengthId = 30 }, + { .songLengthId = 44 }, + { .songLengthId = 38 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x32), - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 50 }, + { .songLengthId = 11 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xa), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 10 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x1d), - BARD_SOUND(0x2a), - BARD_SOUND(0x26), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 29 }, + { .songLengthId = 42 }, + { .songLengthId = 38 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x16), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 22 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x16), - BARD_SOUND(0x32), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 22 }, + { .songLengthId = 50 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x32), - BARD_SOUND(0x26), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 50 }, + { .songLengthId = 38 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x8), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 14 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x21), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 33 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 14 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xf), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 15 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/default_sound.h b/src/data/bard_music/default_sound.h index 39783392a..ad4008e16 100644 --- a/src/data/bard_music/default_sound.h +++ b/src/data/bard_music/default_sound.h @@ -2,12 +2,12 @@ #define GUARD_default_sound_H const struct BardSound gBardSound_InvalidWord[] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND }; #endif //GUARD_default_sound_H diff --git a/src/data/bard_music/endings.h b/src/data/bard_music/endings.h index 2ed3c2189..251347659 100644 --- a/src/data/bard_music/endings.h +++ b/src/data/bard_music/endings.h @@ -2,556 +2,556 @@ #define GUARD_DATA_BARD_MUSIC_ENDINGS_H const struct BardSound gBardSounds_Endings[][6] = { { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x10), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 16 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x14), - BARD_SOUND(0xe), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 20 }, + { .songLengthId = 14 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x23), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 35 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 33 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 44 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0x23), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 35 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 0 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/events.h b/src/data/bard_music/events.h index 79bbb4e4b..b33c1e2b3 100644 --- a/src/data/bard_music/events.h +++ b/src/data/bard_music/events.h @@ -2,236 +2,236 @@ #define GUARD_DATA_BARD_MUSIC_EVENTS_H const struct BardSound gBardSounds_Events[][6] = { { - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x2c), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 44 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x2c), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 44 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 42 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/feelings.h b/src/data/bard_music/feelings.h index 215ff7de9..a46513397 100644 --- a/src/data/bard_music/feelings.h +++ b/src/data/bard_music/feelings.h @@ -2,556 +2,556 @@ #define GUARD_DATA_BARD_MUSIC_FEELINGS_H const struct BardSound gBardSounds_Feelings[][6] = { { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x32), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 50 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x19), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 25 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xb), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 11 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xf), - BARD_SOUND(0x1a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 15 }, + { .songLengthId = 26 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x18), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 24 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x1e), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 30 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x20), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 32 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x8), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x2a), - BARD_SOUND(0x20), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 42 }, + { .songLengthId = 32 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x20), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 32 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND(0x26), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 11 }, + { .songLengthId = 17 }, + { .songLengthId = 38 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x20), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 32 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x20), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 32 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x2a), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 42 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xb), - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 11 }, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x3), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 3 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0xe), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 14 }, + { .songLengthId = 14 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x1a), - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xb), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 11 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x2), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 2 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/greetings.h b/src/data/bard_music/greetings.h index 86bf9668d..ebddb79de 100644 --- a/src/data/bard_music/greetings.h +++ b/src/data/bard_music/greetings.h @@ -2,340 +2,340 @@ #define GUARD_DATA_BARD_MUSIC_GREETINGS_H const struct BardSound gBardSounds_Greetings[][6] = { { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x12), - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 18 }, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x6), - BARD_SOUND(0x17), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 6 }, + { .songLengthId = 23 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x4), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 4 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 38 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x6), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 6 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x28), - BARD_SOUND(0xd), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 40 }, + { .songLengthId = 13 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 11 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x18), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 24 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x23), - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 35 }, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/hobbies.h b/src/data/bard_music/hobbies.h index 5b2b8d92a..db55ef124 100644 --- a/src/data/bard_music/hobbies.h +++ b/src/data/bard_music/hobbies.h @@ -2,436 +2,436 @@ #define GUARD_DATA_BARD_MUSIC_HOBBIES_H const struct BardSound gBardSounds_Hobbies[][6] = { { - BARD_SOUND(0x14), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x26), - BARD_SOUND(0x4), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 38 }, + { .songLengthId = 4 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2f), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 47 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x32), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 50 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2f), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 47 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x5), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 5 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 38 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x1a), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 26 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0xe), - BARD_SOUND(0x8), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 14 }, + { .songLengthId = 8 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x11), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 17 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x5), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 5 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 38 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/length_table.h b/src/data/bard_music/length_table.h index 144c70dfc..d53dcb23f 100644 --- a/src/data/bard_music/length_table.h +++ b/src/data/bard_music/length_table.h @@ -2,19 +2,19 @@ #define GUARD_LENGTH_TABLE_H const int gBardSoundLengthTable[] = { - 0x09, 0x16, 0x0f, 0x10, - 0x27, 0x15, 0x09, 0x1e, - 0x18, 0x0f, 0x19, 0x0c, - 0x16, 0x2d, 0x18, 0x0f, - 0x28, 0x09, 0x15, 0x2a, - 0x12, 0x09, 0x16, 0x0f, - 0x1b, 0x30, 0x12, 0x1b, - 0x21, 0x18, 0x19, 0x27, - 0x13, 0x10, 0x36, 0x12, - 0x09, 0x2d, 0x0f, 0x0c, - 0x27, 0x17, 0x05, 0x2d, - 0x0c, 0x15, 0x30, 0x0c, - 0x15, 0x45, 0x12, 0x0f + 9, 22, 15, 16, + 39, 21, 9, 30, + 24, 15, 25, 12, + 22, 45, 24, 15, + 40, 9, 21, 42, + 18, 9, 22, 15, + 27, 48, 18, 27, + 33, 24, 25, 39, + 19, 16, 54, 18, + 9, 45, 15, 12, + 39, 23, 5, 45, + 12, 21, 48, 12, + 21, 69, 18, 15 }; diff --git a/src/data/bard_music/lifestyle.h b/src/data/bard_music/lifestyle.h index ea81fdeb5..9aeac3757 100644 --- a/src/data/bard_music/lifestyle.h +++ b/src/data/bard_music/lifestyle.h @@ -2,364 +2,364 @@ #define GUARD_DATA_BARD_MUSIC_LIFESTYLE_H const struct BardSound gBardSounds_Lifestyle[][6] = { { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x23), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 35 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x32), - BARD_SOUND(0x3), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 50 }, + { .songLengthId = 3 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x30), - BARD_SOUND(0x5), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 48 }, + { .songLengthId = 5 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x2a), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 42 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0xb), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 11 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x27), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 39 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x32), - BARD_SOUND(0x17), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 50 }, + { .songLengthId = 23 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 50 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/misc.h b/src/data/bard_music/misc.h index 2b06baa1a..1bce1a45d 100644 --- a/src/data/bard_music/misc.h +++ b/src/data/bard_music/misc.h @@ -2,340 +2,340 @@ #define GUARD_DATA_BARD_MUSIC_MISC_H const struct BardSound gBardSounds_Misc[][6] = { { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x2e), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 46 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x1a), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 26 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h index 372cc050c..6c658cd4a 100644 --- a/src/data/bard_music/moves.h +++ b/src/data/bard_music/moves.h @@ -7,2844 +7,2844 @@ const u16 gNumBardWords_Moves = MOVES_COUNT; const struct BardSound gBardSounds_Moves[MOVES_COUNT][6] = { [MOVE_NONE] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POUND] = { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_KARATE_CHOP] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1d), - BARD_SOUND(0xe), - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 29 }, + { .songLengthId = 14 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DOUBLE_SLAP] = { - BARD_SOUND(0x2a), - BARD_SOUND(0xa), - BARD_SOUND(0x2), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 10 }, + { .songLengthId = 2 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_COMET_PUNCH] = { - BARD_SOUND(0x1d), - BARD_SOUND(0xb), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 11 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEGA_PUNCH] = { - BARD_SOUND(0x3), - BARD_SOUND(0x2a), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 42 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PAY_DAY] = { - BARD_SOUND(0x5), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FIRE_PUNCH] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ICE_PUNCH] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1d), - BARD_SOUND(0xe), - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 29 }, + { .songLengthId = 14 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THUNDER_PUNCH] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SCRATCH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_VICE_GRIP] = { - BARD_SOUND(0x14), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GUILLOTINE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RAZOR_WIND] = { - BARD_SOUND(0x5), - BARD_SOUND(0x30), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 48 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SWORDS_DANCE] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x30), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 48 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CUT] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GUST] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WING_ATTACK] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WHIRLWIND] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1d), - BARD_SOUND(0xe), - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 29 }, + { .songLengthId = 14 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FLY] = { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BIND] = { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLAM] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_VINE_WHIP] = { - BARD_SOUND(0x12), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STOMP] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DOUBLE_KICK] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEGA_KICK] = { - BARD_SOUND(0x3), - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_JUMP_KICK] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROLLING_KICK] = { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SAND_ATTACK] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HEADBUTT] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HORN_ATTACK] = { - BARD_SOUND(0x18), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FURY_ATTACK] = { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x2), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 2 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HORN_DRILL] = { - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TACKLE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BODY_SLAM] = { - BARD_SOUND(0x1d), - BARD_SOUND(0xc), - BARD_SOUND(0x2), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 12 }, + { .songLengthId = 2 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WRAP] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TAKE_DOWN] = { - BARD_SOUND(0x3), - BARD_SOUND(0x23), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 35 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THRASH] = { - BARD_SOUND(0x30), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DOUBLE_EDGE] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x24), - BARD_SOUND(0xa), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 36 }, + { .songLengthId = 10 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TAIL_WHIP] = { - BARD_SOUND(0x5), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POISON_STING] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TWINEEDLE] = { - BARD_SOUND(0xf), - BARD_SOUND(0xc), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 12 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PIN_MISSILE] = { - BARD_SOUND(0xf), - BARD_SOUND(0x11), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 17 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LEER] = { - BARD_SOUND(0xe), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BITE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GROWL] = { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROAR] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SING] = { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SUPERSONIC] = { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SONIC_BOOM] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DISABLE] = { - BARD_SOUND(0x11), - BARD_SOUND(0x3), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 3 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ACID] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_EMBER] = { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FLAMETHROWER] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1a), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 26 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MIST] = { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WATER_GUN] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x32), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 50 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HYDRO_PUMP] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SURF] = { - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ICE_BEAM] = { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BLIZZARD] = { - BARD_SOUND(0xf), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PSYBEAM] = { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BUBBLE_BEAM] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x24), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 36 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_AURORA_BEAM] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_HYPER_BEAM] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PECK] = { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DRILL_PECK] = { - BARD_SOUND(0x11), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SUBMISSION] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LOW_KICK] = { - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_COUNTER] = { - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SEISMIC_TOSS] = { - BARD_SOUND(0x12), - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STRENGTH] = { - BARD_SOUND(0x32), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ABSORB] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEGA_DRAIN] = { - BARD_SOUND(0x3), - BARD_SOUND(0x2c), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 44 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LEECH_SEED] = { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GROWTH] = { - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RAZOR_LEAF] = { - BARD_SOUND(0x5), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SOLAR_BEAM] = { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POISON_POWDER] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x2c), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 44 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STUN_SPORE] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLEEP_POWDER] = { - BARD_SOUND(0xc), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PETAL_DANCE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STRING_SHOT] = { - BARD_SOUND(0x32), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DRAGON_RAGE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_FIRE_SPIN] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THUNDER_SHOCK] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THUNDERBOLT] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THUNDER_WAVE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THUNDER] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROCK_THROW] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_EARTHQUAKE] = { - BARD_SOUND(0x30), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FISSURE] = { - BARD_SOUND(0x11), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DIG] = { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TOXIC] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CONFUSION] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x29), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 41 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PSYCHIC] = { - BARD_SOUND(0x12), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HYPNOSIS] = { - BARD_SOUND(0x11), - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEDITATE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_AGILITY] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_QUICK_ATTACK] = { - BARD_SOUND(0x27), - BARD_SOUND(0x11), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 17 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RAGE] = { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TELEPORT] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_NIGHT_SHADE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MIMIC] = { - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SCREECH] = { - BARD_SOUND(0x30), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DOUBLE_TEAM] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RECOVER] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HARDEN] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MINIMIZE] = { - BARD_SOUND(0xf), - BARD_SOUND(0xf), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 15 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SMOKESCREEN] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CONFUSE_RAY] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x2d), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 45 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WITHDRAW] = { - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DEFENSE_CURL] = { - BARD_SOUND(0xe), - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BARRIER] = { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LIGHT_SCREEN] = { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HAZE] = { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_REFLECT] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FOCUS_ENERGY] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, }, [MOVE_BIDE] = { - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_METRONOME] = { - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MIRROR_MOVE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x32), - BARD_SOUND(0x29), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 50 }, + { .songLengthId = 41 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SELF_DESTRUCT] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_EGG_BOMB] = { - BARD_SOUND(0x9), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LICK] = { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SMOG] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLUDGE] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BONE_CLUB] = { - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FIRE_BLAST] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WATERFALL] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x30), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 48 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CLAMP] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SWIFT] = { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SKULL_BASH] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPIKE_CANNON] = { - BARD_SOUND(0x14), - BARD_SOUND_EMPTY, - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 0 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CONSTRICT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_AMNESIA] = { - BARD_SOUND(0x2), - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_KINESIS] = { - BARD_SOUND(0xf), - BARD_SOUND(0xc), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 12 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SOFT_BOILED] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1e), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 30 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HI_JUMP_KICK] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GLARE] = { - BARD_SOUND(0x5), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DREAM_EATER] = { - BARD_SOUND(0xe), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POISON_GAS] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x1b), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 27 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BARRAGE] = { - BARD_SOUND(0x30), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LEECH_LIFE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LOVELY_KISS] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_SKY_ATTACK] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TRANSFORM] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BUBBLE] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DIZZY_PUNCH] = { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPORE] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FLASH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PSYWAVE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPLASH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ACID_ARMOR] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CRABHAMMER] = { - BARD_SOUND(0x2), - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_EXPLOSION] = { - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_FURY_SWIPES] = { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BONEMERANG] = { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_REST] = { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROCK_SLIDE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HYPER_FANG] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SHARPEN] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CONVERSION] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TRI_ATTACK] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SUPER_FANG] = { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLASH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SUBSTITUTE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STRUGGLE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SKETCH] = { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TRIPLE_KICK] = { - BARD_SOUND(0x11), - BARD_SOUND(0x24), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 36 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_THIEF] = { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPIDER_WEB] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MIND_READER] = { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_NIGHTMARE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FLAME_WHEEL] = { - BARD_SOUND(0x3), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SNORE] = { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CURSE] = { - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FLAIL] = { - BARD_SOUND(0x5), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CONVERSION_2] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_AEROBLAST] = { - BARD_SOUND(0x5), - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_COTTON_SPORE] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x1d), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 29 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_REVERSAL] = { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPITE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POWDER_SNOW] = { - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PROTECT] = { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MACH_PUNCH] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SCARY_FACE] = { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FAINT_ATTACK] = { - BARD_SOUND(0x3), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SWEET_KISS] = { - BARD_SOUND(0xe), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BELLY_DRUM] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLUDGE_BOMB] = { - BARD_SOUND(0x2b), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MUD_SLAP] = { - BARD_SOUND(0x2c), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_OCTAZOOKA] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x2c), - BARD_SOUND(0x28), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 44 }, + { .songLengthId = 40 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPIKES] = { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ZAP_CANNON] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 1 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FORESIGHT] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DESTINY_BOND] = { - BARD_SOUND(0x9), - BARD_SOUND(0xf), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 15 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PERISH_SONG] = { - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ICY_WIND] = { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DETECT] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BONE_RUSH] = { - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LOCK_ON] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_OUTRAGE] = { - BARD_SOUND(0x21), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SANDSTORM] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GIGA_DRAIN] = { - BARD_SOUND(0x11), - BARD_SOUND(0x2a), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 42 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ENDURE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CHARM] = { - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROLLOUT] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FALSE_SWIPE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SWAGGER] = { - BARD_SOUND(0x2), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MILK_DRINK] = { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPARK] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FURY_CUTTER] = { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STEEL_WING] = { - BARD_SOUND(0xe), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEAN_LOOK] = { - BARD_SOUND(0xc), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ATTRACT] = { - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLEEP_TALK] = { - BARD_SOUND(0xe), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HEAL_BELL] = { - BARD_SOUND(0xe), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RETURN] = { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PRESENT] = { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FRUSTRATION] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x3), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 3 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SAFEGUARD] = { - BARD_SOUND(0x3), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PAIN_SPLIT] = { - BARD_SOUND(0x3), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SACRED_FIRE] = { - BARD_SOUND(0x3), - BARD_SOUND(0x11), - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 17 }, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_MAGNITUDE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xf), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 15 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DYNAMIC_PUNCH] = { - BARD_SOUND(0x12), - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEGAHORN] = { - BARD_SOUND(0x3), - BARD_SOUND(0x2a), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 42 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DRAGON_BREATH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_BATON_PASS] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1b), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 27 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ENCORE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PURSUIT] = { - BARD_SOUND(0x30), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RAPID_SPIN] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xf), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 15 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SWEET_SCENT] = { - BARD_SOUND(0xe), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_IRON_TAIL] = { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_METAL_CLAW] = { - BARD_SOUND(0x9), - BARD_SOUND(0x24), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 36 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_VITAL_THROW] = { - BARD_SOUND(0x12), - BARD_SOUND(0x24), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 36 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MORNING_SUN] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SYNTHESIS] = { - BARD_SOUND(0xf), - BARD_SOUND(0x2a), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 42 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MOONLIGHT] = { - BARD_SOUND(0x27), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HIDDEN_POWER] = { - BARD_SOUND(0xf), - BARD_SOUND(0x9), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 9 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CROSS_CHOP] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TWISTER] = { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RAIN_DANCE] = { - BARD_SOUND(0x3), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SUNNY_DAY] = { - BARD_SOUND(0x2a), - BARD_SOUND(0xe), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 14 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CRUNCH] = { - BARD_SOUND(0x30), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MIRROR_COAT] = { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_PSYCH_UP] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_EXTREME_SPEED] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ANCIENT_POWER] = { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x21), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 33 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_SHADOW_BALL] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FUTURE_SIGHT] = { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROCK_SMASH] = { - BARD_SOUND(0x1b), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WHIRLPOOL] = { - BARD_SOUND(0x30), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BEAT_UP] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FAKE_OUT] = { - BARD_SOUND(0x3), - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_UPROAR] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_STOCKPILE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SPIT_UP] = { - BARD_SOUND(0x11), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SWALLOW] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HEAT_WAVE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HAIL] = { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TORMENT] = { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FLATTER] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WILL_O_WISP] = { - BARD_SOUND(0x11), - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MEMENTO] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FACADE] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FOCUS_PUNCH] = { - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SMELLING_SALT] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FOLLOW_ME] = { - BARD_SOUND(0x15), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_NATURE_POWER] = { - BARD_SOUND(0x3), - BARD_SOUND(0x30), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 48 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CHARGE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TAUNT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HELPING_HAND] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TRICK] = { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROLE_PLAY] = { - BARD_SOUND(0x18), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WISH] = { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ASSIST] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_INGRAIN] = { - BARD_SOUND(0xf), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SUPERPOWER] = { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MAGIC_COAT] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_RECYCLE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_REVENGE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BRICK_BREAK] = { - BARD_SOUND(0x11), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_YAWN] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_KNOCK_OFF] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ENDEAVOR] = { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ERUPTION] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SKILL_SWAP] = { - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_IMPRISON] = { - BARD_SOUND(0xf), - BARD_SOUND(0xf), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 15 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_REFRESH] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GRUDGE] = { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SNATCH] = { - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SECRET_POWER] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DIVE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ARM_THRUST] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CAMOUFLAGE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TAIL_GLOW] = { - BARD_SOUND(0x4), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 4 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LUSTER_PURGE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MIST_BALL] = { - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FEATHER_DANCE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TEETER_DANCE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BLAZE_KICK] = { - BARD_SOUND(0x5), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MUD_SPORT] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ICE_BALL] = { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_NEEDLE_ARM] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SLACK_OFF] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HYPER_VOICE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x1e), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 30 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POISON_FANG] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CRUSH_CLAW] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BLAST_BURN] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HYDRO_CANNON] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_METEOR_MASH] = { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, }, [MOVE_ASTONISH] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WEATHER_BALL] = { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_AROMATHERAPY] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0xe), + { .songLengthId = 42 }, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 14 }, }, [MOVE_FAKE_TEARS] = { - BARD_SOUND(0x3), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_AIR_CUTTER] = { - BARD_SOUND(0x5), - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_OVERHEAT] = { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ODOR_SLEUTH] = { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROCK_TOMB] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SILVER_WIND] = { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0xf), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 15 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_METAL_SOUND] = { - BARD_SOUND(0x9), - BARD_SOUND(0x1b), - BARD_SOUND(0x21), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 27 }, + { .songLengthId = 33 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_GRASS_WHISTLE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_TICKLE] = { - BARD_SOUND(0x11), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_COSMIC_POWER] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WATER_SPOUT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND(0x21), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + { .songLengthId = 33 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SIGNAL_BEAM] = { - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SHADOW_PUNCH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_EXTRASENSORY] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, }, [MOVE_SKY_UPPERCUT] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SAND_TOMB] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SHEER_COLD] = { - BARD_SOUND(0xe), - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MUDDY_WATER] = { - BARD_SOUND(0x2a), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BULLET_SEED] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_AERIAL_ACE] = { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ICICLE_SPEAR] = { - BARD_SOUND(0x12), - BARD_SOUND(0xf), - BARD_SOUND(0x2a), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 15 }, + { .songLengthId = 42 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, }, [MOVE_IRON_DEFENSE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BLOCK] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_HOWL] = { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DRAGON_CLAW] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_FRENZY_PLANT] = { - BARD_SOUND(0x30), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BULK_UP] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_BOUNCE] = { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MUD_SHOT] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_POISON_TAIL] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x2c), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 44 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_COVET] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_VOLT_TACKLE] = { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_EMPTY, - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 0 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_MAGICAL_LEAF] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x24), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 36 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [MOVE_WATER_SPORT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_CALM_MIND] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_LEAF_BLADE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DRAGON_DANCE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_ROCK_BLAST] = { - BARD_SOUND(0x1b), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_SHOCK_WAVE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_WATER_PULSE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [MOVE_DOOM_DESIRE] = { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, }, [MOVE_PSYCHO_BOOST] = { - BARD_SOUND(0x12), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 18 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/people.h b/src/data/bard_music/people.h index 850ebed11..c1c2f9d3f 100644 --- a/src/data/bard_music/people.h +++ b/src/data/bard_music/people.h @@ -2,604 +2,604 @@ #define GUARD_DATA_BARD_MUSIC_PEOPLE_H const struct BardSound gBardSounds_People[][6] = { { - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x13), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 19 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 45 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND_FULL(0x1a, -0x9, 0x0), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 26, .songLengthOffset = -0x9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x26), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 38 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 45 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1), - BARD_SOUND(0x8), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 1 }, + { .songLengthId = 8 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x8), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 8 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 30 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 41 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x28), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 40 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x27), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 39 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x21), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 33 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x12), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 18 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x26), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 38 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 12 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xc), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 12 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h index 7f68efb7b..57ab42659 100644 --- a/src/data/bard_music/pokemon.h +++ b/src/data/bard_music/pokemon.h @@ -5,3300 +5,3300 @@ const u16 gNumBardWords_Species = NUM_SPECIES; const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = { [SPECIES_NONE] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BULBASAUR] = { - BARD_SOUND(0x24), - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 36 }, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_IVYSAUR] = { - BARD_SOUND(0x14), - BARD_SOUND(0xc), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 12 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VENUSAUR] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CHARMANDER] = { - BARD_SOUND(0x6), - BARD_SOUND(0x2), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 2 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CHARMELEON] = { - BARD_SOUND(0x6), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [SPECIES_CHARIZARD] = { - BARD_SOUND(0x6), - BARD_SOUND(0x11), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 17 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [SPECIES_SQUIRTLE] = { - BARD_SOUND(0x30), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WARTORTLE] = { - BARD_SOUND(0x8), - BARD_SOUND(0x30), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 48 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BLASTOISE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CATERPIE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_METAPOD] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BUTTERFREE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WEEDLE] = { - BARD_SOUND(0xe), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KAKUNA] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x27), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 39 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BEEDRILL] = { - BARD_SOUND(0xc), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PIDGEY] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PIDGEOTTO] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PIDGEOT] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RATTATA] = { - BARD_SOUND_EMPTY, - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RATICATE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SPEAROW] = { - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FEAROW] = { - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_EKANS] = { - BARD_SOUND(0x9), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ARBOK] = { - BARD_SOUND(0x6), - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PIKACHU] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RAICHU] = { - BARD_SOUND(0x12), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SANDSHREW] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SANDSLASH] = { - BARD_SOUND_EMPTY, - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NIDORAN_F] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NIDORINA] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NIDOQUEEN] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NIDORAN_M] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NIDORINO] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NIDOKING] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CLEFAIRY] = { - BARD_SOUND(0x9), - BARD_SOUND(0xb), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 11 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CLEFABLE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VULPIX] = { - BARD_SOUND(0x24), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 36 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NINETALES] = { - BARD_SOUND(0x12), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_JIGGLYPUFF] = { - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [SPECIES_WIGGLYTUFF] = { - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [SPECIES_ZUBAT] = { - BARD_SOUND(0x27), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GOLBAT] = { - BARD_SOUND(0x1a), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ODDISH] = { - BARD_SOUND(0x15), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GLOOM] = { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VILEPLUME] = { - BARD_SOUND(0x14), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PARAS] = { - BARD_SOUND(0x9), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PARASECT] = { - BARD_SOUND(0x9), - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VENONAT] = { - BARD_SOUND(0x9), - BARD_SOUND(0x1a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 26 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VENOMOTH] = { - BARD_SOUND(0x9), - BARD_SOUND(0x1a), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 26 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DIGLETT] = { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DUGTRIO] = { - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MEOWTH] = { - BARD_SOUND(0xc), - BARD_SOUND(0x21), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 33 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PERSIAN] = { - BARD_SOUND(0x32), - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PSYDUCK] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GOLDUCK] = { - BARD_SOUND(0x18), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MANKEY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PRIMEAPE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GROWLITHE] = { - BARD_SOUND(0x21), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ARCANINE] = { - BARD_SOUND(0x6), - BARD_SOUND(0x3), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 3 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_POLIWAG] = { - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_POLIWHIRL] = { - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_POLIWRATH] = { - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ABRA] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KADABRA] = { - BARD_SOUND(0x2c), - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ALAKAZAM] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MACHOP] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MACHOKE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MACHAMP] = { - BARD_SOUND(0x2a), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BELLSPROUT] = { - BARD_SOUND(0xb), - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WEEPINBELL] = { - BARD_SOUND(0xc), - BARD_SOUND(0xf), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 15 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VICTREEBEL] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TENTACOOL] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TENTACRUEL] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GEODUDE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GRAVELER] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GOLEM] = { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PONYTA] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RAPIDASH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SLOWPOKE] = { - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SLOWBRO] = { - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAGNEMITE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 18 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAGNETON] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FARFETCHD] = { - BARD_SOUND(0x6), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DODUO] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x27), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 39 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DODRIO] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SEEL] = { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DEWGONG] = { - BARD_SOUND(0x27), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GRIMER] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MUK] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHELLDER] = { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CLOYSTER] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GASTLY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HAUNTER] = { - BARD_SOUND(0x15), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GENGAR] = { - BARD_SOUND(0x9), - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 8 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ONIX] = { - BARD_SOUND(0x15), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DROWZEE] = { - BARD_SOUND(0x21), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HYPNO] = { - BARD_SOUND(0x11), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KRABBY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KINGLER] = { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VOLTORB] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ELECTRODE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_EXEGGCUTE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_EXEGGUTOR] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0x9), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 9 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [SPECIES_CUBONE] = { - BARD_SOUND(0x2d), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAROWAK] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1a), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 26 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HITMONLEE] = { - BARD_SOUND(0x11), - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HITMONCHAN] = { - BARD_SOUND(0x11), - BARD_SOUND(0x15), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 21 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LICKITUNG] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KOFFING] = { - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WEEZING] = { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RHYHORN] = { - BARD_SOUND(0x14), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RHYDON] = { - BARD_SOUND(0x12), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CHANSEY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TANGELA] = { - BARD_SOUND(0x2), - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KANGASKHAN] = { - BARD_SOUND_EMPTY, - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HORSEA] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SEADRA] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GOLDEEN] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SEAKING] = { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_STARYU] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_STARMIE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MR_MIME] = { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x12), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 18 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SCYTHER] = { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_JYNX] = { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ELECTABUZZ] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAGMAR] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PINSIR] = { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TAUROS] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAGIKARP] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GYARADOS] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x1d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 29 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LAPRAS] = { - BARD_SOUND(0x2c), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DITTO] = { - BARD_SOUND(0x11), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_EEVEE] = { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VAPOREON] = { - BARD_SOUND(0x3), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_JOLTEON] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FLAREON] = { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PORYGON] = { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OMANYTE] = { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OMASTAR] = { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KABUTO] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x27), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 39 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KABUTOPS] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x27), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 39 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_AERODACTYL] = { - BARD_SOUND(0x3), - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SNORLAX] = { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ARTICUNO] = { - BARD_SOUND(0x6), - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ZAPDOS] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MOLTRES] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DRATINI] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DRAGONAIR] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x15), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 21 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DRAGONITE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x15), - BARD_SOUND(0x12), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 21 }, + { .songLengthId = 18 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MEWTWO] = { - BARD_SOUND(0x2d), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MEW] = { - BARD_SOUND(0x2d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CHIKORITA] = { - BARD_SOUND(0x11), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BAYLEEF] = { - BARD_SOUND(0x3), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MEGANIUM] = { - BARD_SOUND(0x3), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CYNDAQUIL] = { - BARD_SOUND(0xf), - BARD_SOUND(0x2a), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 42 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_QUILAVA] = { - BARD_SOUND(0x11), - BARD_SOUND(0x6), - BARD_SOUND(0x8), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 6 }, + { .songLengthId = 8 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TYPHLOSION] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, [SPECIES_TOTODILE] = { - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND(0x12), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + { .songLengthId = 18 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CROCONAW] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FERALIGATR] = { - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND(0xf), - BARD_SOUND(0x3), - BARD_SOUND(0x30), - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + { .songLengthId = 15 }, + { .songLengthId = 3 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, }, [SPECIES_SENTRET] = { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FURRET] = { - BARD_SOUND(0x30), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HOOTHOOT] = { - BARD_SOUND(0x27), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NOCTOWL] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LEDYBA] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LEDIAN] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SPINARAK] = { - BARD_SOUND(0xf), - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ARIADOS] = { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CROBAT] = { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CHINCHOU] = { - BARD_SOUND(0xf), - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LANTURN] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PICHU] = { - BARD_SOUND(0xc), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CLEFFA] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_IGGLYBUFF] = { - BARD_SOUND(0x11), - BARD_SOUND(0x2a), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 42 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TOGEPI] = { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TOGETIC] = { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NATU] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_XATU] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAREEP] = { - BARD_SOUND(0x1d), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FLAAFFY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_AMPHAROS] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x6), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 6 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BELLOSSOM] = { - BARD_SOUND(0x9), - BARD_SOUND(0x1b), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 27 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MARILL] = { - BARD_SOUND(0x8), - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_AZUMARILL] = { - BARD_SOUND(0x8), - BARD_SOUND(0x27), - BARD_SOUND(0x2c), - BARD_SOUND(0x10), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 39 }, + { .songLengthId = 44 }, + { .songLengthId = 16 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SUDOWOODO] = { - BARD_SOUND(0x27), - BARD_SOUND(0x18), - BARD_SOUND(0x27), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 24 }, + { .songLengthId = 39 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_POLITOED] = { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HOPPIP] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SKIPLOOM] = { - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_JUMPLUFF] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_AIPOM] = { - BARD_SOUND(0x3), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SUNKERN] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SUNFLORA] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_YANMA] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WOOPER] = { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_QUAGSIRE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x12), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 18 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ESPEON] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_UMBREON] = { - BARD_SOUND(0x2a), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MURKROW] = { - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SLOWKING] = { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MISDREAVUS] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_UNOWN] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WOBBUFFET] = { - BARD_SOUND(0x1d), - BARD_SOUND(0x2c), - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 44 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GIRAFARIG] = { - BARD_SOUND(0x30), - BARD_SOUND_EMPTY, - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 0 }, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PINECO] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FORRETRESS] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DUNSPARCE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GLIGAR] = { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_STEELIX] = { - BARD_SOUND(0xc), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SNUBBULL] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GRANBULL] = { - BARD_SOUND(0x2), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_QWILFISH] = { - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SCIZOR] = { - BARD_SOUND(0x11), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHUCKLE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HERACROSS] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SNEASEL] = { - BARD_SOUND(0xc), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TEDDIURSA] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_URSARING] = { - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SLUGMA] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAGCARGO] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SWINUB] = { - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PILOSWINE] = { - BARD_SOUND(0x11), - BARD_SOUND(0x1a), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 26 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CORSOLA] = { - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_REMORAID] = { - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OCTILLERY] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DELIBIRD] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MANTINE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SKARMORY] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HOUNDOUR] = { - BARD_SOUND(0x23), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 35 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HOUNDOOM] = { - BARD_SOUND(0x21), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KINGDRA] = { - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PHANPY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DONPHAN] = { - BARD_SOUND(0x1b), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PORYGON2] = { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_STANTLER] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SMEARGLE] = { - BARD_SOUND(0x30), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TYROGUE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HITMONTOP] = { - BARD_SOUND(0x11), - BARD_SOUND(0x15), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 21 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SMOOCHUM] = { - BARD_SOUND(0x27), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ELEKID] = { - BARD_SOUND(0xb), - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 11 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAGBY] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MILTANK] = { - BARD_SOUND(0x11), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BLISSEY] = { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RAIKOU] = { - BARD_SOUND(0x12), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ENTEI] = { - BARD_SOUND(0x9), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SUICUNE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LARVITAR] = { - BARD_SOUND(0x15), - BARD_SOUND(0x11), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 17 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PUPITAR] = { - BARD_SOUND(0x27), - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TYRANITAR] = { - BARD_SOUND(0x12), - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LUGIA] = { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HO_OH] = { - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CELEBI] = { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_B] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_C] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_D] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_E] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_F] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_G] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_H] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_I] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_J] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_K] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_L] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_M] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_N] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_O] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_P] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_Q] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_R] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_S] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_T] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_U] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_V] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_W] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_X] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_Y] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_OLD_UNOWN_Z] = { - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TREECKO] = { - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GROVYLE] = { - BARD_SOUND(0x18), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SCEPTILE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TORCHIC] = { - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_COMBUSKEN] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BLAZIKEN] = { - BARD_SOUND(0x3), - BARD_SOUND(0x11), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 17 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MUDKIP] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MARSHTOMP] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SWAMPERT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_POOCHYENA] = { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MIGHTYENA] = { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ZIGZAGOON] = { - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LINOONE] = { - BARD_SOUND(0x14), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WURMPLE] = { - BARD_SOUND(0x30), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SILCOON] = { - BARD_SOUND(0x11), - BARD_SOUND(0x28), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 40 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BEAUTIFLY] = { - BARD_SOUND(0x2d), - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 9 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CASCOON] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DUSTOX] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x17), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 23 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LOTAD] = { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LOMBRE] = { - BARD_SOUND(0x18), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LUDICOLO] = { - BARD_SOUND(0x27), - BARD_SOUND(0x9), - BARD_SOUND(0x1a), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 9 }, + { .songLengthId = 26 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SEEDOT] = { - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NUZLEAF] = { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHIFTRY] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NINCADA] = { - BARD_SOUND(0xf), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NINJASK] = { - BARD_SOUND(0xf), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHEDINJA] = { - BARD_SOUND(0x9), - BARD_SOUND(0xf), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 15 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TAILLOW] = { - BARD_SOUND(0x3), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SWELLOW] = { - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHROOMISH] = { - BARD_SOUND(0x27), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BRELOOM] = { - BARD_SOUND(0x9), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SPINDA] = { - BARD_SOUND(0xf), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WINGULL] = { - BARD_SOUND(0xf), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PELIPPER] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SURSKIT] = { - BARD_SOUND(0x30), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MASQUERAIN] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WAILMER] = { - BARD_SOUND(0x5), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WAILORD] = { - BARD_SOUND(0x3), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SKITTY] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DELCATTY] = { - BARD_SOUND(0x9), - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KECLEON] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BALTOY] = { - BARD_SOUND(0x1), - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CLAYDOL] = { - BARD_SOUND(0x3), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NOSEPASS] = { - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TORKOAL] = { - BARD_SOUND(0x18), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SABLEYE] = { - BARD_SOUND(0x3), - BARD_SOUND(0xb), - BARD_SOUND(0x12), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 11 }, + { .songLengthId = 18 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BARBOACH] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WHISCASH] = { - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LUVDISC] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CORPHISH] = { - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CRAWDAUNT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FEEBAS] = { - BARD_SOUND(0xe), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MILOTIC] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CARVANHA] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 1 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHARPEDO] = { - BARD_SOUND(0x1d), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TRAPINCH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VIBRAVA] = { - BARD_SOUND(0x11), - BARD_SOUND(0x1b), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 27 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_FLYGON] = { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAKUHITA] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HARIYAMA] = { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ELECTRIKE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MANECTRIC] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_NUMEL] = { - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CAMERUPT] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SPHEAL] = { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SEALEO] = { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WALREIN] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CACNEA] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CACTURNE] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SNORUNT] = { - BARD_SOUND(0x18), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GLALIE] = { - BARD_SOUND(0x5), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LUNATONE] = { - BARD_SOUND(0x27), - BARD_SOUND(0x2c), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 44 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SOLROCK] = { - BARD_SOUND(0x18), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_AZURILL] = { - BARD_SOUND(0x6), - BARD_SOUND(0x27), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 39 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SPOINK] = { - BARD_SOUND(0x1e), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GRUMPIG] = { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_PLUSLE] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MINUN] = { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MAWILE] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MEDITITE] = { - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_MEDICHAM] = { - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SWABLU] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ALTARIA] = { - BARD_SOUND(0x6), - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WYNAUT] = { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DUSKULL] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DUSCLOPS] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ROSELIA] = { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SLAKOTH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VIGOROTH] = { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SLAKING] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GULPIN] = { - BARD_SOUND(0x24), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 36 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SWALOT] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_TROPIUS] = { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_WHISMUR] = { - BARD_SOUND(0x11), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LOUDRED] = { - BARD_SOUND(0x21), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_EXPLOUD] = { - BARD_SOUND(0x9), - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CLAMPERL] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_HUNTAIL] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GOREBYSS] = { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ABSOL] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHUPPET] = { - BARD_SOUND(0x2a), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BANETTE] = { - BARD_SOUND(0x3), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SEVIPER] = { - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ZANGOOSE] = { - BARD_SOUND(0x3), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RELICANTH] = { - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ARON] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LAIRON] = { - BARD_SOUND(0x5), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_AGGRON] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CASTFORM] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_VOLBEAT] = { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ILLUMISE] = { - BARD_SOUND(0xc), - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LILEEP] = { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CRADILY] = { - BARD_SOUND(0x3), - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ANORITH] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_ARMALDO] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x1b), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 27 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RALTS] = { - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KIRLIA] = { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GARDEVOIR] = { - BARD_SOUND(0x1b), - BARD_SOUND(0x9), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 9 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BAGON] = { - BARD_SOUND(0x5), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SHELGON] = { - BARD_SOUND(0x9), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_SALAMENCE] = { - BARD_SOUND_EMPTY, - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_BELDUM] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_METANG] = { - BARD_SOUND(0x9), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_METAGROSS] = { - BARD_SOUND(0x9), - BARD_SOUND(0x2a), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 42 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_REGIROCK] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_REGICE] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_REGISTEEL] = { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_KYOGRE] = { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_GROUDON] = { - BARD_SOUND(0x21), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_RAYQUAZA] = { - BARD_SOUND(0x3), - BARD_SOUND(0x3), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 3 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LATIAS] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_LATIOS] = { - BARD_SOUND_EMPTY, - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_JIRACHI] = { - BARD_SOUND(0x30), - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_DEOXYS] = { - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, [SPECIES_CHIMECHO] = { - BARD_SOUND(0x12), - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 18 }, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/speech.h b/src/data/bard_music/speech.h index bd963f235..dc7844ec8 100644 --- a/src/data/bard_music/speech.h +++ b/src/data/bard_music/speech.h @@ -2,484 +2,484 @@ #define GUARD_DATA_BARD_MUSIC_SPEECH_H const struct BardSound gBardSounds_Speech[][6] = { { - BARD_SOUND(0x9), - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0xa), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 10 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x17), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 23 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x11), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 17 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0x2d), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 45 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x14), - BARD_SOUND(0xc), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 20 }, + { .songLengthId = 12 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xb), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 11 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xb), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 11 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x30), - BARD_SOUND(0x6), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 48 }, + { .songLengthId = 6 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x23), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 35 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 50 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x23), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 35 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x2c), - BARD_SOUND(0x1), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 44 }, + { .songLengthId = 1 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xa), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 10 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND(0x26), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + { .songLengthId = 38 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x7), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 7 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x10), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 16 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x28), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 40 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x26), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 38 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x6), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 6 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/status.h b/src/data/bard_music/status.h index 516c648a4..9a3fd0139 100644 --- a/src/data/bard_music/status.h +++ b/src/data/bard_music/status.h @@ -2,876 +2,876 @@ #define GUARD_DATA_BARD_MUSIC_STATUS_H const struct BardSound gBardSounds_Status[][6] = { { - BARD_SOUND(0x8), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 8 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x3), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 3 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x6), - BARD_SOUND(0xc), - BARD_SOUND(0x6), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 6 }, + { .songLengthId = 12 }, + { .songLengthId = 6 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0xf), - BARD_SOUND(0x11), - BARD_SOUND(0x2c), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 15 }, + { .songLengthId = 17 }, + { .songLengthId = 44 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x15), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 21 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 44 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x1b), - BARD_SOUND(0x32), - BARD_SOUND(0x1), - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND_NULL, + { + { .songLengthId = 27 }, + { .songLengthId = 50 }, + { .songLengthId = 1 }, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 21 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x24), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, - { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x15), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 21 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x18), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 24 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x32), - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 50 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x29), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 41 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x6), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 6 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2d), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0xf), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 15 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x17), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 23 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x6), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 6 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x32), - BARD_SOUND(0x8), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 50 }, + { .songLengthId = 8 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x18), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 24 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x30), - BARD_SOUND(0x18), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 48 }, + { .songLengthId = 24 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2d), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 45 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x24), - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 36 }, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x30), - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 48 }, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x9), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 9 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0xe), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 14 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x20), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 32 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x20), - BARD_SOUND(0x1b), - BARD_SOUND(0x1e), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 32 }, + { .songLengthId = 27 }, + { .songLengthId = 30 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND_EMPTY, - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 0 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x8), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 8 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0xf), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 15 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x26), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 38 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x11), - BARD_SOUND(0x15), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 17 }, + { .songLengthId = 21 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x21), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 33 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x24), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 36 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x30), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 48 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xc), - BARD_SOUND(0x3), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 12 }, + { .songLengthId = 3 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x9), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 9 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x30), - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 48 }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x2a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 42 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x15), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 21 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1), - BARD_SOUND(0x2c), - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 1 }, + { .songLengthId = 44 }, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x30), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 6 }, + { .songLengthId = 48 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2d), - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 45 }, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0x27), - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 39 }, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x11), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 17 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x14), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 0 }, + { .songLengthId = 20 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x12), - BARD_SOUND(0x1b), - BARD_SOUND(0x30), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 18 }, + { .songLengthId = 27 }, + { .songLengthId = 48 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 26 }, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0x2d), - BARD_SOUND(0x21), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - }, + { .songLengthId = 45 }, + { .songLengthId = 33 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + }, { - BARD_SOUND(0xe), - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 14 }, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/time.h b/src/data/bard_music/time.h index befcf842d..1f7dac8a6 100644 --- a/src/data/bard_music/time.h +++ b/src/data/bard_music/time.h @@ -2,364 +2,364 @@ #define GUARD_DATA_BARD_MUSIC_TIME_H const struct BardSound gBardSounds_Time[][6] = { { - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x1c), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 28 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 2 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x9), - BARD_SOUND(0x2c), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 9 }, + { .songLengthId = 44 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x32), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 50 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0xc), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 12 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x2c), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 44 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x11), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 17 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x28), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 40 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x21), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 33 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x30), - BARD_SOUND(0x5), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 48 }, + { .songLengthId = 5 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0xf), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 15 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x32), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 50 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 14 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x30), - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 48 }, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 14 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/trainer.h b/src/data/bard_music/trainer.h index b98887a68..05fc6a6ef 100644 --- a/src/data/bard_music/trainer.h +++ b/src/data/bard_music/trainer.h @@ -2,220 +2,220 @@ #define GUARD_DATA_BARD_MUSIC_TRAINER_H const struct BardSound gBardSounds_Trainer[][6] = { { - BARD_SOUND(0x12), - BARD_SOUND(0x27), - BARD_SOUND(0x2d), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 39 }, + { .songLengthId = 45 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x15), - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 21 }, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x12), - BARD_SOUND(0x32), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 18 }, + { .songLengthId = 50 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x12), - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x6), + { .songLengthId = 9 }, + { .songLengthId = 18 }, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 6 }, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x8), - BARD_SOUND(0x6), - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0xc), + { .songLengthId = 9 }, + { .songLengthId = 8 }, + { .songLengthId = 6 }, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 12 }, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x32), - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 50 }, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x1b), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 27 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xc), - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 12 }, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x30), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 9 }, + { .songLengthId = 48 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/trendysaying.h b/src/data/bard_music/trendysaying.h index 75870c241..ccd9083ea 100644 --- a/src/data/bard_music/trendysaying.h +++ b/src/data/bard_music/trendysaying.h @@ -2,268 +2,268 @@ #define GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H const struct BardSound gBardSounds_TrendySaying[][6] = { { - BARD_SOUND(0x5), - BARD_SOUND(0x2), - BARD_SOUND(0x14), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 2 }, + { .songLengthId = 20 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1b), - BARD_SOUND(0x1b), - BARD_SOUND(0x17), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27 }, + { .songLengthId = 27 }, + { .songLengthId = 23 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x26), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 38 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x2c), - BARD_SOUND(0x12), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 44 }, + { .songLengthId = 18 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND(0x1d), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + { .songLengthId = 29 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x11), - BARD_SOUND(0x3), - BARD_SOUND(0x1a), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 17 }, + { .songLengthId = 3 }, + { .songLengthId = 26 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xb), - BARD_SOUND(0x11), - BARD_SOUND(0xe), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 11 }, + { .songLengthId = 17 }, + { .songLengthId = 14 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_EMPTY, - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 0 }, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x3), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 3 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x23), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 35 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x24), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 36 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1d), - BARD_SOUND(0x2c), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 29 }, + { .songLengthId = 44 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2b), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 43 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 42 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/voices.h b/src/data/bard_music/voices.h index 5919bebcb..97f249ecb 100644 --- a/src/data/bard_music/voices.h +++ b/src/data/bard_music/voices.h @@ -2,508 +2,508 @@ #define GUARD_DATA_BARD_MUSIC_VOICES_H const struct BardSound gBardSounds_Voices[][6] = { { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND(0x33), - BARD_SOUND(0xc), - BARD_SOUND(0x30), - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + { .songLengthId = 51 }, + { .songLengthId = 12 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND_FULL(0x1b, 0x5, 0x8), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 27, .songLengthOffset = 0x5, .unused = 0x8 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x28), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 40 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x19), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 25 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0x31), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 49 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x23), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 35 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND(0x11), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + { .songLengthId = 17 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xa), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 10 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0xe), - BARD_SOUND(0xc), - BARD_SOUND(0x2), - BARD_SOUND(0x24), - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 14 }, + { .songLengthId = 12 }, + { .songLengthId = 2 }, + { .songLengthId = 36 }, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x13), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 19 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0xe), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 14 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x12), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 18 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1e), - BARD_SOUND(0x1e), - BARD_SOUND(0x1e), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 30 }, + { .songLengthId = 30 }, + { .songLengthId = 30 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x1), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 1 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x17), - BARD_SOUND(0xb), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 23 }, + { .songLengthId = 11 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x17), - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 23 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x5), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 5 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x13), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 19 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x27), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 39 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x1a), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 26 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 26 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND(0xc), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + { .songLengthId = 12 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x9), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 9 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND(0x18), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + { .songLengthId = 24 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x2a), - BARD_SOUND(0x2c), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 42 }, + { .songLengthId = 44 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0xe), - BARD_SOUND(0x30), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 14 }, + { .songLengthId = 48 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x1c), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 28 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x27), - BARD_SOUND(0x27), - BARD_SOUND(0x27), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 39 }, + { .songLengthId = 39 }, + { .songLengthId = 39 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0xf), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 15 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x18), - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 24 }, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x4), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 4 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x22), - BARD_SOUND(0xd), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 34 }, + { .songLengthId = 13 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x7), - BARD_SOUND(0x33), - BARD_SOUND(0x33), - BARD_SOUND_NULL, - BARD_SOUND_NULL, - BARD_SOUND_NULL, + { .songLengthId = 7 }, + { .songLengthId = 51 }, + { .songLengthId = 51 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, + NULL_BARD_SOUND, }, { - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND(0x6), - BARD_SOUND_NULL, - BARD_SOUND_NULL + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + { .songLengthId = 6 }, + NULL_BARD_SOUND, + NULL_BARD_SOUND, } }; diff --git a/src/data/bard_music/word_pitch.h b/src/data/bard_music/word_pitch.h index 35527017c..7b4205da5 100644 --- a/src/data/bard_music/word_pitch.h +++ b/src/data/bard_music/word_pitch.h @@ -3,184 +3,52 @@ #define PITCH_END 0x1800 -static const s16 sPitch1_0[] = { - -0x300, PITCH_END -}; - -static const s16 sPitch1_1[] = { - 0x0900, PITCH_END -}; - -static const s16 sPitch1_2[] = { - 0x0100, PITCH_END -}; - -static const s16 sPitch1_3[] = { - 0x0400, PITCH_END -}; - -static const s16 sPitch1_4[] = { - 0x0b00, PITCH_END -}; - -static const s16 sPitch2_0[] = { - -0x300, -0x100, PITCH_END -}; - -static const s16 sPitch2_1[] = { - -0x300, 0x0200, PITCH_END -}; - -static const s16 sPitch2_2[] = { - 0x0200, 0x0400, PITCH_END -}; - -static const s16 sPitch2_3[] = { - 0x0600, 0x0800, PITCH_END -}; - -static const s16 sPitch2_4[] = { - 0x0900, 0x0800, PITCH_END -}; - -static const s16 sPitch3_0[] = { - -0x300, -0x100, -0x300, PITCH_END -}; - -static const s16 sPitch3_1[] = { - 0x0400, -0x300, 0x0400, PITCH_END -}; - -static const s16 sPitch3_2[] = { - 0x0900, 0x0800, 0x0600, PITCH_END -}; - -static const s16 sPitch3_3[] = { - 0x0100, 0x0200, 0x0400, PITCH_END -}; - -static const s16 sPitch3_4[] = { - 0x0600, 0x1000, 0x0d00, PITCH_END -}; - -static const s16 sPitch4_0[] = { - 0x0400, 0x0900, 0x0400, 0x0900, PITCH_END -}; - -static const s16 sPitch4_1[] = { - 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END -}; - -static const s16 sPitch4_2[] = { - 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END -}; - -static const s16 sPitch4_3[] = { - 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END -}; - -static const s16 sPitch4_4[] = { - 0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END -}; - -static const s16 sPitch5_0[] = { - -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END -}; - -static const s16 sPitch5_1[] = { - 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END -}; - -static const s16 sPitch5_2[] = { - 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END -}; - -static const s16 sPitch5_3[] = { - 0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END -}; - -static const s16 sPitch5_4[] = { - 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END -}; - -static const s16 sPitch6_0[] = { - -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END -}; - -static const s16 sPitch6_1[] = { - 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END -}; - -static const s16 sPitch6_2[] = { - 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END -}; - -static const s16 sPitch6_3[] = { - 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END -}; - -static const s16 sPitch6_4[] = { - 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END -}; - -static const s16 sPitch7_0[] = { - 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END -}; - -static const s16 sPitch7_1[] = { - 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END -}; - -static const s16 sPitch7_2[] = { - 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END -}; - -static const s16 sPitch7_3[] = { - 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END -}; - -static const s16 sPitch7_4[] = { - 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END -}; +static const s16 sPitch1_0[] = { -0x300, PITCH_END }; +static const s16 sPitch1_1[] = { 0x0900, PITCH_END }; +static const s16 sPitch1_2[] = { 0x0100, PITCH_END }; +static const s16 sPitch1_3[] = { 0x0400, PITCH_END }; +static const s16 sPitch1_4[] = { 0x0b00, PITCH_END }; +static const s16 sPitch2_0[] = { -0x300, -0x100, PITCH_END }; +static const s16 sPitch2_1[] = { -0x300, 0x0200, PITCH_END }; +static const s16 sPitch2_2[] = { 0x0200, 0x0400, PITCH_END }; +static const s16 sPitch2_3[] = { 0x0600, 0x0800, PITCH_END }; +static const s16 sPitch2_4[] = { 0x0900, 0x0800, PITCH_END }; +static const s16 sPitch3_0[] = { -0x300, -0x100, -0x300, PITCH_END }; +static const s16 sPitch3_1[] = { 0x0400, -0x300, 0x0400, PITCH_END }; +static const s16 sPitch3_2[] = { 0x0900, 0x0800, 0x0600, PITCH_END }; +static const s16 sPitch3_3[] = { 0x0100, 0x0200, 0x0400, PITCH_END }; +static const s16 sPitch3_4[] = { 0x0600, 0x1000, 0x0d00, PITCH_END }; +static const s16 sPitch4_0[] = { 0x0400, 0x0900, 0x0400, 0x0900, PITCH_END }; +static const s16 sPitch4_1[] = { 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END }; +static const s16 sPitch4_2[] = { 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END }; +static const s16 sPitch4_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END }; +static const s16 sPitch4_4[] = { 0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END }; +static const s16 sPitch5_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END }; +static const s16 sPitch5_1[] = { 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END }; +static const s16 sPitch5_2[] = { 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END }; +static const s16 sPitch5_3[] = { 0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END }; +static const s16 sPitch5_4[] = { 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END }; +static const s16 sPitch6_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END }; +static const s16 sPitch6_1[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END }; +static const s16 sPitch6_2[] = { 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END }; +static const s16 sPitch6_3[] = { 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END }; +static const s16 sPitch6_4[] = { 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END }; +static const s16 sPitch7_0[] = { 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END }; +static const s16 sPitch7_1[] = { 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END }; +static const s16 sPitch7_2[] = { 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END }; +static const s16 sPitch7_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END }; +static const s16 sPitch7_4[] = { 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END }; // Only sPitch7_# are used below // This table is always indexed with (x + 30), where x is some value 0 - 4 static const s16 *const sBardSoundPitchTables[] = { - sPitch1_0, - sPitch1_1, - sPitch1_2, - sPitch1_3, - sPitch1_4, - sPitch2_0, - sPitch2_1, - sPitch2_2, - sPitch2_3, - sPitch2_4, - sPitch3_0, - sPitch3_1, - sPitch3_2, - sPitch3_3, - sPitch3_4, - sPitch4_0, - sPitch4_1, - sPitch4_2, - sPitch4_3, - sPitch4_4, - sPitch5_0, - sPitch5_1, - sPitch5_2, - sPitch5_3, - sPitch5_4, - sPitch6_0, - sPitch6_1, - sPitch6_2, - sPitch6_3, - sPitch6_4, - sPitch7_0, - sPitch7_1, - sPitch7_2, - sPitch7_3, - sPitch7_4 + sPitch1_0, sPitch1_1, sPitch1_2, sPitch1_3, sPitch1_4, + sPitch2_0, sPitch2_1, sPitch2_2, sPitch2_3, sPitch2_4, + sPitch3_0, sPitch3_1, sPitch3_2, sPitch3_3, sPitch3_4, + sPitch4_0, sPitch4_1, sPitch4_2, sPitch4_3, sPitch4_4, + sPitch5_0, sPitch5_1, sPitch5_2, sPitch5_3, sPitch5_4, + sPitch6_0, sPitch6_1, sPitch6_2, sPitch6_3, sPitch6_4, + sPitch7_0, sPitch7_1, sPitch7_2, sPitch7_3, sPitch7_4 }; diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 5c9dd7125..689dcf6a1 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -479,7 +479,7 @@ static void BardSing(struct Task *task, struct BardSong *song) song->sound = GetWordSounds(word); GetWordPhonemes(song, MACRO1(word)); song->currWord++; - if (song->sound->var00 != 0xFF) + if (song->sound->songLengthId != 0xFF) song->state = 0; else { @@ -497,9 +497,9 @@ static void BardSing(struct Task *task, struct BardSong *song) { case 0: song->phonemeTimer = song->phonemes[song->currPhoneme].length; - if (sound->var00 <= 50) + if (sound->songLengthId <= 50) { - u8 num = sound->var00 / 3; + u8 num = sound->songLengthId / 3; m4aSongNumStart(PH_TRAP_HELD + 3 * num); } song->state = 2; @@ -507,7 +507,7 @@ static void BardSing(struct Task *task, struct BardSong *song) break; case 2: song->state = 1; - if (sound->var00 <= 50) + if (sound->songLengthId <= 50) { song->volume = 0x100 + sound->volume * 16; m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume); @@ -529,7 +529,7 @@ static void BardSing(struct Task *task, struct BardSong *song) if (song->phonemeTimer == 0) { song->currPhoneme++; - if (song->currPhoneme != 6 && song->sound[song->currPhoneme].var00 != 0xFF) + if (song->currPhoneme != 6 && song->sound[song->currPhoneme].songLengthId != 0xFF) song->state = 0; else {