Merge pull request #1164 from GriffinRichards/fix-fanfarealign

Fix alignment in sFanfares
This commit is contained in:
GriffinR 2020-08-31 13:49:01 -04:00 committed by GitHub
commit ff9204a5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -41,24 +41,24 @@ static void Task_DuckBGMForPokemonCry(u8 taskId);
static void RestoreBGMVolumeAfterPokemonCry(void);
static const struct Fanfare sFanfares[] = {
{ MUS_LEVEL_UP, 80 },
{ MUS_OBTAIN_ITEM, 160 },
{ MUS_EVOLVED, 220 },
{ MUS_OBTAIN_TMHM, 220 },
{ MUS_HEAL, 160 },
{ MUS_OBTAIN_BADGE, 340 },
{ MUS_MOVE_DELETED, 180 },
{ MUS_OBTAIN_BERRY, 120 },
{ MUS_AWAKEN_LEGEND, 710 },
{ MUS_SLOTS_JACKPOT, 250 },
{ MUS_SLOTS_WIN, 150 },
{ MUS_TOO_BAD, 160 },
{ MUS_RG_POKE_FLUTE, 450 },
{ MUS_RG_OBTAIN_KEY_ITEM, 170 },
{ MUS_RG_DEX_RATING, 196 },
{ MUS_OBTAIN_B_POINTS, 313 },
{ MUS_OBTAIN_SYMBOL, 318 },
{ MUS_REGISTER_MATCH_CALL, 135 },
{ MUS_LEVEL_UP, 80 },
{ MUS_OBTAIN_ITEM, 160 },
{ MUS_EVOLVED, 220 },
{ MUS_OBTAIN_TMHM, 220 },
{ MUS_HEAL, 160 },
{ MUS_OBTAIN_BADGE, 340 },
{ MUS_MOVE_DELETED, 180 },
{ MUS_OBTAIN_BERRY, 120 },
{ MUS_AWAKEN_LEGEND, 710 },
{ MUS_SLOTS_JACKPOT, 250 },
{ MUS_SLOTS_WIN, 150 },
{ MUS_TOO_BAD, 160 },
{ MUS_RG_POKE_FLUTE, 450 },
{ MUS_RG_OBTAIN_KEY_ITEM, 170 },
{ MUS_RG_DEX_RATING, 196 },
{ MUS_OBTAIN_B_POINTS, 313 },
{ MUS_OBTAIN_SYMBOL, 318 },
{ MUS_REGISTER_MATCH_CALL, 135 },
};
#define CRY_VOLUME 120 // was 125 in R/S