diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /data/scripts/day_care.inc | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'data/scripts/day_care.inc')
| -rw-r--r-- | data/scripts/day_care.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 22d99f2a4..fd3273c78 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -21,7 +21,7 @@ Route117_EventScript_1B2262:: @ 81B2262 compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 - clearflag 134 + clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release end @@ -39,10 +39,10 @@ Route117_EventScript_1B22B2:: @ 81B22B2 playfanfare 367 waitfanfare waitmessage - waitbutton + waitbuttonpress msgbox Route117_Text_1B27CD, 4 special GiveEggFromDaycare - clearflag 134 + clearflag FLAG_PENDING_DAYCARE_EGG release end @@ -70,7 +70,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress setvar 0x8004, 0 call Route117_EventScript_1B22CD setvar 0x8004, 1 @@ -110,9 +110,9 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar 0x8005, GetSelectedDaycareMonNickname waitse - playpokecry 0x8005, 0 + playmoncry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 - waitpokecry + waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE specialvar RESULT, GetDaycareState @@ -211,9 +211,9 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse - playpokecry RESULT, 0 + playmoncry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 - waitpokecry + waitmoncry specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 |