diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-05 16:21:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 16:21:48 -0500 |
| commit | 44f47ab524f0b3b7648e5f66dfaf014488fc21e3 (patch) | |
| tree | f05b0cdb3e31020ea0d1c9025b922972f8a4eb51 /src/sound.c | |
| parent | 3d5d298c63a88c1a581b58d44dcc3706a7799c04 (diff) | |
| parent | 2e8d5d6279088ac5a2aad108f9ce895b2619e3bb (diff) | |
Merge pull request #288 from PikalaxALT/dodrio_berry_picking
Dodrio Berry Picking
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/sound.c b/src/sound.c index b88d3b642..99e9a162e 100644 --- a/src/sound.c +++ b/src/sound.c @@ -6,6 +6,7 @@ #include "m4a.h" #include "main.h" #include "constants/songs.h" +#include "constants/fanfares.h" #include "task.h" struct Fanfare @@ -41,20 +42,20 @@ extern struct ToneData gCryTable[]; extern struct ToneData gCryTable2[]; 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 }, - { MUS_POKEFUE, 450 }, - { MUS_FAN5, 170 }, - { MUS_FAN2, 196 } + [FANFARE_00] = { MUS_FANFA1, 80 }, + [FANFARE_01] = { MUS_FANFA4, 160 }, + [FANFARE_02] = { MUS_FANFA5, 220 }, + [FANFARE_03] = { MUS_ME_WAZA, 220 }, + [FANFARE_04] = { MUS_ME_ASA, 160 }, + [FANFARE_05] = { MUS_ME_BACHI, 340 }, + [FANFARE_06] = { MUS_ME_WASURE, 180 }, + [FANFARE_07] = { MUS_ME_KINOMI, 120 }, + [FANFARE_08] = { MUS_ME_B_BIG, 250 }, + [FANFARE_09] = { MUS_ME_B_SMALL, 150 }, + [FANFARE_10] = { MUS_ME_ZANNEN, 160 }, + [FANFARE_POKEFLUTE] = { MUS_POKEFUE, 450 }, + [FANFARE_KEY_ITEM] = { MUS_FAN5, 170 }, + [FANFARE_DEX_EVAL] = { MUS_FAN2, 196 } }; extern u16 SpeciesToCryId(u16); |