summaryrefslogtreecommitdiff
path: root/src/field
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-12-17 21:25:11 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-12-17 21:25:11 -0500
commit60cf72d59541962fc0fc287c6a19bbf4750a1404 (patch)
treedd99632983c9bc9597d857ccb334c28b46ef6993 /src/field
parentfcbcf6f93cf3850bac06c77c49a74c21866ebde8 (diff)
Decompile German bard music data
Diffstat (limited to 'src/field')
-rw-r--r--src/field/bard_music.c31
1 files changed, 30 insertions, 1 deletions
diff --git a/src/field/bard_music.c b/src/field/bard_music.c
index 4122c2e26..5c48749cf 100644
--- a/src/field/bard_music.c
+++ b/src/field/bard_music.c
@@ -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)
{