dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document dodrio berry picking

Browse Source
This commit is contained in:
GriffinR
2021-03-01 01:54:51 -05:00
parent 91ab30fa71
commit b9c733495b
22 changed files with 4250 additions and 3685 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sound.c
+22 -19
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 },
[FANFARE_LEVEL_UP] = { MUS_LEVEL_UP, 80 },
[FANFARE_OBTAIN_ITEM] = { MUS_OBTAIN_ITEM, 160 },
[FANFARE_EVOLVED] = { MUS_EVOLVED, 220 },
[FANFARE_OBTAIN_TMHM] = { MUS_OBTAIN_TMHM, 220 },
[FANFARE_HEAL] = { MUS_HEAL, 160 },
[FANFARE_OBTAIN_BADGE] = { MUS_OBTAIN_BADGE, 340 },
[FANFARE_MOVE_DELETED] = { MUS_MOVE_DELETED, 180 },
[FANFARE_OBTAIN_BERRY] = { MUS_OBTAIN_BERRY, 120 },
[FANFARE_AWAKEN_LEGEND] = { MUS_AWAKEN_LEGEND, 710 },
[FANFARE_SLOTS_JACKPOT] = { MUS_SLOTS_JACKPOT, 250 },
[FANFARE_SLOTS_WIN] = { MUS_SLOTS_WIN, 150 },
[FANFARE_TOO_BAD] = { MUS_TOO_BAD, 160 },
[FANFARE_RG_POKE_FLUTE] = { MUS_RG_POKE_FLUTE, 450 },
[FANFARE_RG_OBTAIN_KEY_ITEM] = { MUS_RG_OBTAIN_KEY_ITEM, 170 },
[FANFARE_RG_DEX_RATING] = { MUS_RG_DEX_RATING, 196 },
[FANFARE_OBTAIN_B_POINTS] = { MUS_OBTAIN_B_POINTS, 313 },
[FANFARE_OBTAIN_SYMBOL] = { MUS_OBTAIN_SYMBOL, 318 },
[FANFARE_REGISTER_MATCH_CALL] = { MUS_REGISTER_MATCH_CALL, 135 },
};
#define CRY_VOLUME 120 // was 125 in R/S
@@ -212,6 +212,7 @@ bool8 WaitFanfare(bool8 stop)
}
}
// Unused
void StopFanfareByFanfareNum(u8 fanfareNum)
{
m4aSongNumStop(sFanfares[fanfareNum].songNum);
@@ -220,7 +221,7 @@ void StopFanfareByFanfareNum(u8 fanfareNum)
void PlayFanfare(u16 songNum)
{
s32 i;
for (i = 0; (u32)i < 18; i++)
for (i = 0; (u32)i < ARRAY_COUNT(sFanfares); i++)
{
if (sFanfares[i].songNum == songNum)
{
@@ -230,6 +231,8 @@ void PlayFanfare(u16 songNum)
}
}
// songNum is not in sFanfares
// Play first fanfare in table instead
PlayFanfareByFanfareNum(0);
CreateFanfareTask();
}