diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
| commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
| tree | 5707f8764920abcd4cffca84c675e5c53c32559d /src/bard_music.c | |
| parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'src/bard_music.c')
| -rw-r--r-- | src/bard_music.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/bard_music.c b/src/bard_music.c index 43c2923d2..a31568475 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -1,5 +1,5 @@ #include "global.h" -#include "asm.h" +#include "easy_chat.h" struct BardSound { @@ -45,12 +45,25 @@ static s16 sub_814A2B8(u32 arg0, u32 arg1) return gUnknown_08417068[arg0][arg1]; } +#if ENGLISH struct BardSound *sub_814A2D0(u16 arg0, u16 arg1) { struct BardSound *sounds = gBardMusicTable[arg0]; return &sounds[arg1]; } +#elif GERMAN +struct BardSound *sub_814A2D0(u16 arg0, u16 arg1) +{ + u32 index; + struct BardSound *sounds; + + sounds = gBardMusicTable[arg0]; + index = de_sub_80EB748(arg0, arg1); + + return &sounds[index]; +} +#endif s32 sub_814A2EC(struct UnkBard2 *dest, struct UnkBard *src, u16 arg2) { |