summaryrefslogtreecommitdiff
path: root/src/sound.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-09 20:33:28 -0400
committerGitHub <noreply@github.com>2019-10-09 20:33:28 -0400
commitc61603fb3812011981e22478bce93aba8b7ec183 (patch)
tree0bcf628e1f3615159cbae3e5c638825544699182 /src/sound.c
parent77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff)
parentf3bd7f06c9f260597575f60af8daf8985ce80fe1 (diff)
Merge pull request #113 from PikalaxALT/main_menu
Main menu and Song Constants
Diffstat (limited to 'src/sound.c')
-rw-r--r--src/sound.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/sound.c b/src/sound.c
index 41b9f5b7d..325ff783a 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -42,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 },
- { BGM_FRLG_FLUTE, 450 },
- { BGM_FRLG_ME_KEYITEM, 170 },
- { BGM_FRLG_ME_POKEDEX_EVAL, 196 }
+ { 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 }
};
extern u16 SpeciesToCryId(u16);