Review changes

This commit is contained in:
Eduardo Quezada 2022-10-27 11:26:09 -03:00
parent 85ce30b1d6
commit 85c0d2dac8
27 changed files with 10867 additions and 11002 deletions

View File

@ -3,11 +3,11 @@
struct BardSound struct BardSound
{ {
/*0x00*/ u8 var00; /*0x00*/ u8 songLengthId;
/*0x01*/ s8 var01; /*0x01*/ s8 songLengthOffset;
/*0x02*/ u16 var02; /*0x02*/ u16 unused;
/*0x04*/ s16 volume; /*0x04*/ s16 volume;
/*0x06*/ u16 var06; /*0x06*/ u16 unused2;
}; };
struct BardPhoneme struct BardPhoneme

View File

@ -51,9 +51,9 @@ void GetWordPhonemes(struct BardSong *song, u16 word)
for (i = 0; i < 6; i ++) for (i = 0; i < 6; i ++)
{ {
sound = &song->sound[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->phonemes[i].pitch = CalcWordPitch(word + 30, i);
song->length += song->phonemes[i].length; song->length += song->phonemes[i].length;
} }

File diff suppressed because it is too large Load Diff

View File

@ -2,292 +2,292 @@
#define GUARD_DATA_BARD_MUSIC_ADJECTIVES_H #define GUARD_DATA_BARD_MUSIC_ADJECTIVES_H
const struct BardSound gBardSounds_Adjectives[][6] = { const struct BardSound gBardSounds_Adjectives[][6] = {
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2d), { .songLengthId = 45 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 }
} }
}; };

View File

@ -1,10 +1,7 @@
#ifndef GUARD_BARD_SOUNDS_TABLE_H #ifndef GUARD_BARD_SOUNDS_TABLE_H
#define GUARD_BARD_SOUNDS_TABLE_H #define GUARD_BARD_SOUNDS_TABLE_H
#define BARD_SOUND_FULL(var00, var01, var02) { var00, var01, var02, 0x0, 0x0 } #define NULL_BARD_SOUND { .songLengthId = 0xff }
#define BARD_SOUND(var00) BARD_SOUND_FULL(var00, 0x0, 0x0)
#define BARD_SOUND_EMPTY BARD_SOUND(0x0)
#define BARD_SOUND_NULL BARD_SOUND(0xff)
#include "pokemon.h" #include "pokemon.h"
#include "moves.h" #include "moves.h"

View File

@ -2,508 +2,508 @@
#define GUARD_DATA_BARD_MUSIC_BATTLE_H #define GUARD_DATA_BARD_MUSIC_BATTLE_H
const struct BardSound gBardSounds_Battle[][6] = { const struct BardSound gBardSounds_Battle[][6] = {
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x16), { .songLengthId = 22 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,556 +2,556 @@
#define GUARD_DATA_BARD_MUSIC_CONDITIONS_H #define GUARD_DATA_BARD_MUSIC_CONDITIONS_H
const struct BardSound gBardSounds_Conditions[][6] = { const struct BardSound gBardSounds_Conditions[][6] = {
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x20), { .songLengthId = 32 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x19), { .songLengthId = 25 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x16), { .songLengthId = 22 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x16), { .songLengthId = 22 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,12 +2,12 @@
#define GUARD_default_sound_H #define GUARD_default_sound_H
const struct BardSound gBardSound_InvalidWord[] = { const struct BardSound gBardSound_InvalidWord[] = {
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND
}; };
#endif //GUARD_default_sound_H #endif //GUARD_default_sound_H

View File

@ -2,556 +2,556 @@
#define GUARD_DATA_BARD_MUSIC_ENDINGS_H #define GUARD_DATA_BARD_MUSIC_ENDINGS_H
const struct BardSound gBardSounds_Endings[][6] = { const struct BardSound gBardSounds_Endings[][6] = {
{ {
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,236 +2,236 @@
#define GUARD_DATA_BARD_MUSIC_EVENTS_H #define GUARD_DATA_BARD_MUSIC_EVENTS_H
const struct BardSound gBardSounds_Events[][6] = { const struct BardSound gBardSounds_Events[][6] = {
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,556 +2,556 @@
#define GUARD_DATA_BARD_MUSIC_FEELINGS_H #define GUARD_DATA_BARD_MUSIC_FEELINGS_H
const struct BardSound gBardSounds_Feelings[][6] = { const struct BardSound gBardSounds_Feelings[][6] = {
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x19), { .songLengthId = 25 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x20), { .songLengthId = 32 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x20), { .songLengthId = 32 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x20), { .songLengthId = 32 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x20), { .songLengthId = 32 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x20), { .songLengthId = 32 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,340 +2,340 @@
#define GUARD_DATA_BARD_MUSIC_GREETINGS_H #define GUARD_DATA_BARD_MUSIC_GREETINGS_H
const struct BardSound gBardSounds_Greetings[][6] = { const struct BardSound gBardSounds_Greetings[][6] = {
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x28), { .songLengthId = 40 },
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,436 +2,436 @@
#define GUARD_DATA_BARD_MUSIC_HOBBIES_H #define GUARD_DATA_BARD_MUSIC_HOBBIES_H
const struct BardSound gBardSounds_Hobbies[][6] = { const struct BardSound gBardSounds_Hobbies[][6] = {
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2f), { .songLengthId = 47 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2f), { .songLengthId = 47 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,19 +2,19 @@
#define GUARD_LENGTH_TABLE_H #define GUARD_LENGTH_TABLE_H
const int gBardSoundLengthTable[] = { const int gBardSoundLengthTable[] = {
0x09, 0x16, 0x0f, 0x10, 9, 22, 15, 16,
0x27, 0x15, 0x09, 0x1e, 39, 21, 9, 30,
0x18, 0x0f, 0x19, 0x0c, 24, 15, 25, 12,
0x16, 0x2d, 0x18, 0x0f, 22, 45, 24, 15,
0x28, 0x09, 0x15, 0x2a, 40, 9, 21, 42,
0x12, 0x09, 0x16, 0x0f, 18, 9, 22, 15,
0x1b, 0x30, 0x12, 0x1b, 27, 48, 18, 27,
0x21, 0x18, 0x19, 0x27, 33, 24, 25, 39,
0x13, 0x10, 0x36, 0x12, 19, 16, 54, 18,
0x09, 0x2d, 0x0f, 0x0c, 9, 45, 15, 12,
0x27, 0x17, 0x05, 0x2d, 39, 23, 5, 45,
0x0c, 0x15, 0x30, 0x0c, 12, 21, 48, 12,
0x15, 0x45, 0x12, 0x0f 21, 69, 18, 15
}; };

View File

@ -2,364 +2,364 @@
#define GUARD_DATA_BARD_MUSIC_LIFESTYLE_H #define GUARD_DATA_BARD_MUSIC_LIFESTYLE_H
const struct BardSound gBardSounds_Lifestyle[][6] = { const struct BardSound gBardSounds_Lifestyle[][6] = {
{ {
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x29), { .songLengthId = 41 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,340 +2,340 @@
#define GUARD_DATA_BARD_MUSIC_MISC_H #define GUARD_DATA_BARD_MUSIC_MISC_H
const struct BardSound gBardSounds_Misc[][6] = { const struct BardSound gBardSounds_Misc[][6] = {
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x2e), { .songLengthId = 46 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,484 +2,484 @@
#define GUARD_DATA_BARD_MUSIC_SPEECH_H #define GUARD_DATA_BARD_MUSIC_SPEECH_H
const struct BardSound gBardSounds_Speech[][6] = { const struct BardSound gBardSounds_Speech[][6] = {
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x2d), { .songLengthId = 45 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x7), { .songLengthId = 7 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x10), { .songLengthId = 16 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x28), { .songLengthId = 40 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

File diff suppressed because it is too large Load Diff

View File

@ -2,364 +2,364 @@
#define GUARD_DATA_BARD_MUSIC_TIME_H #define GUARD_DATA_BARD_MUSIC_TIME_H
const struct BardSound gBardSounds_Time[][6] = { const struct BardSound gBardSounds_Time[][6] = {
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x28), { .songLengthId = 40 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x21), { .songLengthId = 33 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,220 +2,220 @@
#define GUARD_DATA_BARD_MUSIC_TRAINER_H #define GUARD_DATA_BARD_MUSIC_TRAINER_H
const struct BardSound gBardSounds_Trainer[][6] = { const struct BardSound gBardSounds_Trainer[][6] = {
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x2d), { .songLengthId = 45 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x15), { .songLengthId = 21 },
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x6), { .songLengthId = 6 },
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x8), { .songLengthId = 8 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xc), { .songLengthId = 12 },
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x32), { .songLengthId = 50 },
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,268 +2,268 @@
#define GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H #define GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H
const struct BardSound gBardSounds_TrendySaying[][6] = { const struct BardSound gBardSounds_TrendySaying[][6] = {
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x14), { .songLengthId = 20 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x1b), { .songLengthId = 27 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x26), { .songLengthId = 38 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_EMPTY, { .songLengthId = 0 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x3), { .songLengthId = 3 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1d), { .songLengthId = 29 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2b), { .songLengthId = 43 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -2,508 +2,508 @@
#define GUARD_DATA_BARD_MUSIC_VOICES_H #define GUARD_DATA_BARD_MUSIC_VOICES_H
const struct BardSound gBardSounds_Voices[][6] = { const struct BardSound gBardSounds_Voices[][6] = {
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND_FULL(0x1b, 0x5, 0x8), { .songLengthId = 27, .songLengthOffset = 0x5, .unused = 0x8 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x28), { .songLengthId = 40 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x19), { .songLengthId = 25 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x31), { .songLengthId = 49 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x23), { .songLengthId = 35 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND(0x11), { .songLengthId = 17 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xa), { .songLengthId = 10 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x2), { .songLengthId = 2 },
BARD_SOUND(0x24), { .songLengthId = 36 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x13), { .songLengthId = 19 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x12), { .songLengthId = 18 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND(0x1e), { .songLengthId = 30 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x1), { .songLengthId = 1 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND(0xb), { .songLengthId = 11 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x17), { .songLengthId = 23 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x5), { .songLengthId = 5 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x13), { .songLengthId = 19 },
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0x7), { .songLengthId = 7 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1a), { .songLengthId = 26 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND(0xc), { .songLengthId = 12 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x9), { .songLengthId = 9 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x2a), { .songLengthId = 42 },
BARD_SOUND(0x2c), { .songLengthId = 44 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0xe), { .songLengthId = 14 },
BARD_SOUND(0x30), { .songLengthId = 48 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x1c), { .songLengthId = 28 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND(0x27), { .songLengthId = 39 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0xf), { .songLengthId = 15 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x18), { .songLengthId = 24 },
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x4), { .songLengthId = 4 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x7), { .songLengthId = 7 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x22), { .songLengthId = 34 },
BARD_SOUND(0xd), { .songLengthId = 13 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x7), { .songLengthId = 7 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND(0x33), { .songLengthId = 51 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL, NULL_BARD_SOUND,
}, },
{ {
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND(0x6), { .songLengthId = 6 },
BARD_SOUND_NULL, NULL_BARD_SOUND,
BARD_SOUND_NULL NULL_BARD_SOUND,
} }
}; };

View File

@ -3,184 +3,52 @@
#define PITCH_END 0x1800 #define PITCH_END 0x1800
static const s16 sPitch1_0[] = { static const s16 sPitch1_0[] = { -0x300, PITCH_END };
-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_1[] = { static const s16 sPitch1_4[] = { 0x0b00, PITCH_END };
0x0900, 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 sPitch1_2[] = { static const s16 sPitch2_3[] = { 0x0600, 0x0800, PITCH_END };
0x0100, 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 sPitch1_3[] = { static const s16 sPitch3_2[] = { 0x0900, 0x0800, 0x0600, PITCH_END };
0x0400, 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 sPitch1_4[] = { static const s16 sPitch4_1[] = { 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END };
0x0b00, 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 sPitch2_0[] = { static const s16 sPitch5_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END };
-0x300, -0x100, 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 sPitch2_1[] = { static const s16 sPitch5_4[] = { 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END };
-0x300, 0x0200, 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 sPitch2_2[] = { static const s16 sPitch6_3[] = { 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END };
0x0200, 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 sPitch2_3[] = { static const s16 sPitch7_2[] = { 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END };
0x0600, 0x0800, 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 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 // Only sPitch7_# are used below
// This table is always indexed with (x + 30), where x is some value 0 - 4 // This table is always indexed with (x + 30), where x is some value 0 - 4
static const s16 *const sBardSoundPitchTables[] = { static const s16 *const sBardSoundPitchTables[] = {
sPitch1_0, sPitch1_0, sPitch1_1, sPitch1_2, sPitch1_3, sPitch1_4,
sPitch1_1, sPitch2_0, sPitch2_1, sPitch2_2, sPitch2_3, sPitch2_4,
sPitch1_2, sPitch3_0, sPitch3_1, sPitch3_2, sPitch3_3, sPitch3_4,
sPitch1_3, sPitch4_0, sPitch4_1, sPitch4_2, sPitch4_3, sPitch4_4,
sPitch1_4, sPitch5_0, sPitch5_1, sPitch5_2, sPitch5_3, sPitch5_4,
sPitch2_0, sPitch6_0, sPitch6_1, sPitch6_2, sPitch6_3, sPitch6_4,
sPitch2_1, sPitch7_0, sPitch7_1, sPitch7_2, sPitch7_3, sPitch7_4
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
}; };

View File

@ -479,7 +479,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
song->sound = GetWordSounds(word); song->sound = GetWordSounds(word);
GetWordPhonemes(song, MACRO1(word)); GetWordPhonemes(song, MACRO1(word));
song->currWord++; song->currWord++;
if (song->sound->var00 != 0xFF) if (song->sound->songLengthId != 0xFF)
song->state = 0; song->state = 0;
else else
{ {
@ -497,9 +497,9 @@ static void BardSing(struct Task *task, struct BardSong *song)
{ {
case 0: case 0:
song->phonemeTimer = song->phonemes[song->currPhoneme].length; 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); m4aSongNumStart(PH_TRAP_HELD + 3 * num);
} }
song->state = 2; song->state = 2;
@ -507,7 +507,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
break; break;
case 2: case 2:
song->state = 1; song->state = 1;
if (sound->var00 <= 50) if (sound->songLengthId <= 50)
{ {
song->volume = 0x100 + sound->volume * 16; song->volume = 0x100 + sound->volume * 16;
m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume); m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume);
@ -529,7 +529,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
if (song->phonemeTimer == 0) if (song->phonemeTimer == 0)
{ {
song->currPhoneme++; 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; song->state = 0;
else else
{ {