Decompile German bard music data

This commit is contained in:
PikalaxALT
2017-12-17 21:25:11 -05:00
parent fcbcf6f93c
commit 60cf72d595
4 changed files with 12694 additions and 14438 deletions
-14412
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -12640,29 +12640,4 @@ static const struct BardSound BardMusic_POKEMON_2[][6] = {
}
};
static const struct BardSound (*const gBardMusicTable[])[6] = {
BardMusic_POKEMON,
BardMusic_TRAINER,
BardMusic_STATUS,
BardMusic_BATTLE,
BardMusic_GREETINGS,
BardMusic_PEOPLE,
BardMusic_VOICES,
BardMusic_SPEECH,
BardMusic_ENDINGS,
BardMusic_FEELINGS,
BardMusic_CONDITIONS,
BardMusic_ACTIONS,
BardMusic_LIFESTYLE,
BardMusic_HOBBIES,
BardMusic_TIME,
BardMusic_MISC,
BardMusic_ADJECTIVES,
BardMusic_EVENTS,
BardMusic_MOVE_1,
BardMusic_MOVE_2,
BardMusic_TRENDY_SAYING,
BardMusic_POKEMON_2
};
#endif //GUARD_DATA_BARD_MUSIC_H
+30 -1
View File
@@ -140,7 +140,36 @@ static const u32 sBardSoundLengthDeltas[] = {
15
};
#include "../src/data/bard_music.h"
#if ENGLISH
#include "../src/data/bard_music_en.h"
#elif GERMAN
#include "../src/data/bard_music_de.h"
#endif // ENGLISH/GERMAN
static const struct BardSound (*const gBardMusicTable[])[6] = {
BardMusic_POKEMON,
BardMusic_TRAINER,
BardMusic_STATUS,
BardMusic_BATTLE,
BardMusic_GREETINGS,
BardMusic_PEOPLE,
BardMusic_VOICES,
BardMusic_SPEECH,
BardMusic_ENDINGS,
BardMusic_FEELINGS,
BardMusic_CONDITIONS,
BardMusic_ACTIONS,
BardMusic_LIFESTYLE,
BardMusic_HOBBIES,
BardMusic_TIME,
BardMusic_MISC,
BardMusic_ADJECTIVES,
BardMusic_EVENTS,
BardMusic_MOVE_1,
BardMusic_MOVE_2,
BardMusic_TRENDY_SAYING,
BardMusic_POKEMON_2
};
static s16 CalcWordPitch(u32 arg0, u32 songPos)
{