Merge branch 'master' into main-menu-state-machine

This commit is contained in:
Phlosioneer
2019-02-26 22:34:42 -05:00
457 changed files with 17619 additions and 23557 deletions

View File

@@ -574,7 +574,7 @@ static void Task_EggHatchPlayBGM(u8 taskID)
if (gTasks[taskID].data[0] == 0)
{
StopMapMusic();
PlayRainSoundEffect();
PlayRainStoppingSoundEffect();
}
if (gTasks[taskID].data[0] == 1)
PlayBGM(MUS_ME_SHINKA);