diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:17:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-28 16:17:48 -0400 |
commit | 08a8aad65a16d7846c06f669218b5190a31b6b33 (patch) | |
tree | b9e38f5284d16732e467fdfd9e891d1535f387fd /data/scripts/day_care.inc | |
parent | 71a066f9457416581a22ddc82d81984e45d06dca (diff) | |
parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) |
Merge branch 'master' into doc-cablecar
Diffstat (limited to 'data/scripts/day_care.inc')
-rw-r--r-- | data/scripts/day_care.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 87995581f..ea8552510 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -38,7 +38,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83 Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D message Route117_Text_ReceivedEgg - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT @@ -217,7 +217,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_REGI + playse SE_SHOP msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT waitse playmoncry VAR_RESULT, 0 |