dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split data_835B488.s to sound.s; correct FRLG music constants

Browse Source
This commit is contained in:
PikalaxALT
2019-04-12 10:23:45 -04:00
parent 02974254af
commit bd5c36e0f3
10 changed files with 259 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sound.c
+17 -1
View File
@@ -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);