Merge branch 'master' into battle

src/daycare.c

@@ -1795,7 +1795,7 @@ void EggHatch(void)
     ScriptContext2_Enable();
     CreateTask(Task_EggHatch, 10);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
-    sub_812B478();
+    HelpSystem_Disable();
 }
 
 static void Task_EggHatch(u8 taskID)
@@ -1901,7 +1901,7 @@ static void EggHatchSetMonNickname(void)
     SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar3);
     FreeMonSpritesGfx();
     Free(sEggHatchData);
-    sub_812B484();
+    HelpSystem_Enable();
     SetMainCallback2(CB2_ReturnToField);
 }
 
@@ -2024,7 +2024,7 @@ static void CB2_EggHatch_1(void)
             UnsetBgTilemapBuffer(1);
             Free(sEggHatchData);
             SetMainCallback2(CB2_ReturnToField);
-            sub_812B484();
+            HelpSystem_Enable();
         }
         break;
     }
@@ -2142,7 +2142,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
     sprite->data[0]++;
     if (!gPaletteFade.active)
     {
-        PlaySE(SE_JIHANKI);
+        PlaySE(SE_TAMAGO);
         sprite->invisible = TRUE;
         sprite->callback = SpriteCB_Egg_5;
         sprite->data[0] = 0;