diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/sound.c | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
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; |