diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-12 10:23:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-12 10:23:45 -0400 |
| commit | bd5c36e0f376518a8fbeac0cc178ea60b9e2b274 (patch) | |
| tree | 481a51a758479833ff3486e280428552bbec1f73 /src/sound.c | |
| parent | 02974254affdcffb0cf8f44bd094ba5c9d320d4a (diff) | |
Split data_835B488.s to sound.s; correct FRLG music constants
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/sound.c b/src/sound.c index f94e44506..ba6511d1c 100644 --- a/src/sound.c +++ b/src/sound.c @@ -40,7 +40,23 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE3; extern struct ToneData gCryTable[]; extern struct ToneData gCryTable2[]; -extern const struct Fanfare sFanfares[]; + +static const struct Fanfare sFanfares[] = { + { MUS_FANFA1, 80 }, + { MUS_FANFA4, 160 }, + { MUS_FANFA5, 220 }, + { MUS_ME_WAZA, 220 }, + { MUS_ME_ASA, 160 }, + { MUS_ME_BACHI, 340 }, + { MUS_ME_WASURE, 180 }, + { MUS_ME_KINOMI, 120 }, + { MUS_ME_B_BIG, 250 }, + { MUS_ME_B_SMALL, 150 }, + { MUS_ME_ZANNEN, 160 }, + { BGM_FRLG_FLUTE, 450 }, + { BGM_FRLG_ME_KEYITEM, 170 }, + { BGM_FRLG_ME_POKEDEX_EVAL, 196 } +}; extern u16 SpeciesToCryId(u16); |