diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-16 23:59:58 -0400 |
| commit | 8b97aa28047d5bbc24448b47cbda901a3adb9d0e (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/sound.c | |
| parent | dda361afb7e2abafc15a498968580be6d1a83cfe (diff) | |
| parent | f568060cae85a1e8c70a0216ea5d1c6e79d6a528 (diff) | |
Merge remote-tracking branch 'marijn/clean/headers'
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sound.c b/src/sound.c index ed69ca01d..c9c4916b0 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,9 +1,9 @@ #include "global.h" #include "gba/m4a_internal.h" #include "sound.h" -#include "asm.h" #include "battle.h" #include "m4a.h" +#include "main.h" #include "songs.h" #include "task.h" @@ -13,7 +13,7 @@ struct Fanfare u16 duration; }; -// Hack: different prototype than definition +// FIXME: different prototype than definition u32 SpeciesToCryId(u32); extern u16 gBattleTypeFlags; |