summaryrefslogtreecommitdiff
path: root/data/scripts/day_care.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/day_care.inc')
-rw-r--r--data/scripts/day_care.inc54
1 files changed, 27 insertions, 27 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 1a7e56cfd..2eb32cc71 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -9,7 +9,7 @@ Route117_EventScript_1B222D:: @ 81B222D
goto_if_eq Route117_EventScript_1B22E7
compare VAR_RESULT, 3
goto_if_eq Route117_EventScript_1B22FE
- msgbox Route117_Text_1B25CB, 4
+ msgbox Route117_Text_1B25CB, MSGBOX_DEFAULT
release
end
@@ -20,7 +20,7 @@ Route117_EventScript_1B2262:: @ 81B2262
msgbox Route117_Text_1B28C4, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_EventScript_1B2298
- msgbox Route117_Text_1B2745, 4
+ msgbox Route117_Text_1B2745, MSGBOX_DEFAULT
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
release
@@ -30,7 +30,7 @@ Route117_EventScript_1B2298:: @ 81B2298
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if_ne Route117_EventScript_1B22B2
- msgbox Route117_Text_1B2766, 4
+ msgbox Route117_Text_1B2766, MSGBOX_DEFAULT
release
end
@@ -40,7 +40,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
waitfanfare
waitmessage
waitbuttonpress
- msgbox Route117_Text_1B27CD, 4
+ msgbox Route117_Text_1B27CD, MSGBOX_DEFAULT
special GiveEggFromDaycare
clearflag FLAG_PENDING_DAYCARE_EGG
release
@@ -53,12 +53,12 @@ Route117_EventScript_1B22CD:: @ 81B22CD
return
Route117_EventScript_1B22DE:: @ 81B22DE
- msgbox Route117_Text_1B27E3, 4
+ msgbox Route117_Text_1B27E3, MSGBOX_DEFAULT
return
Route117_EventScript_1B22E7:: @ 81B22E7
special GetDaycareMonNicknames
- msgbox Route117_Text_1B2710, 4
+ msgbox Route117_Text_1B2710, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
call Route117_EventScript_1B22CD
release
@@ -66,7 +66,7 @@ Route117_EventScript_1B22E7:: @ 81B22E7
Route117_EventScript_1B22FE:: @ 81B22FE
special GetDaycareMonNicknames
- msgbox Route117_Text_1B2897, 4
+ msgbox Route117_Text_1B2897, MSGBOX_DEFAULT
special SetDaycareCompatibilityString
special ShowFieldMessageStringVar4
waitmessage
@@ -91,7 +91,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
msgbox Route117_PokemonDayCare_Text_1B28F2, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_1B236C
- msgbox Route117_PokemonDayCare_Text_1B2A14, 4
+ msgbox Route117_PokemonDayCare_Text_1B2A14, MSGBOX_DEFAULT
release
end
@@ -99,8 +99,8 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
specialvar VAR_RESULT, GetNumValidDaycarePartyMons
compare VAR_RESULT, 1
goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3
- msgbox Route117_PokemonDayCare_Text_1B2947, 4
- fadescreen 1
+ msgbox Route117_PokemonDayCare_Text_1B2947, MSGBOX_DEFAULT
+ fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, 255
@@ -111,7 +111,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
specialvar VAR_0x8005, GetSelectedDaycareMonNickname
waitse
playmoncry VAR_0x8005, 0
- msgbox Route117_PokemonDayCare_Text_1B296E, 4
+ msgbox Route117_PokemonDayCare_Text_1B296E, MSGBOX_DEFAULT
waitmoncry
special StoreSelectedPokemonInDaycare
incrementgamestat GAME_STAT_USED_DAYCARE
@@ -122,7 +122,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
end
Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0
- msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+ msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT
release
end
@@ -134,22 +134,22 @@ Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA
end
Route117_PokemonDayCare_EventScript_1B23F3:: @ 81B23F3
- msgbox Route117_PokemonDayCare_Text_1B2BBB, 4
+ msgbox Route117_PokemonDayCare_Text_1B2BBB, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_1B23FD:: @ 81B23FD
- msgbox Route117_PokemonDayCare_Text_1B2C17, 4
+ msgbox Route117_PokemonDayCare_Text_1B2C17, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_1B2407:: @ 81B2407
- msgbox Route117_PokemonDayCare_Text_1B29F4, 4
+ msgbox Route117_PokemonDayCare_Text_1B29F4, MSGBOX_DEFAULT
release
end
Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411
- msgbox Route117_PokemonDayCare_Text_1B2ACC, 4
+ msgbox Route117_PokemonDayCare_Text_1B2ACC, MSGBOX_DEFAULT
return
Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
@@ -159,7 +159,7 @@ Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
return
Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B
- msgbox Route117_PokemonDayCare_Text_1B2A88, 4
+ msgbox Route117_PokemonDayCare_Text_1B2A88, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
call Route117_PokemonDayCare_EventScript_1B241A
msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO
@@ -199,7 +199,7 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4
specialvar VAR_RESULT, HasEnoughMoneyFor
compare VAR_RESULT, 1
goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE
- msgbox Route117_PokemonDayCare_Text_1B2A30, 4
+ msgbox Route117_PokemonDayCare_Text_1B2A30, MSGBOX_DEFAULT
release
end
@@ -209,10 +209,10 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
specialvar VAR_RESULT, TakePokemonFromDaycare
special PayMoneyFor
playse SE_REGI
- msgbox Route117_PokemonDayCare_Text_1B2B75, 4
+ msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT
waitse
playmoncry VAR_RESULT, 0
- msgbox Route117_PokemonDayCare_Text_1B2B93, 4
+ msgbox Route117_PokemonDayCare_Text_1B2B93, MSGBOX_DEFAULT
waitmoncry
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 2
@@ -228,7 +228,7 @@ Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520
end
Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539
- msgbox Route117_PokemonDayCare_Text_1B2AEF, 4
+ msgbox Route117_PokemonDayCare_Text_1B2AEF, MSGBOX_DEFAULT
release
end
@@ -252,13 +252,13 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543
face_down
set_visible
walk_slow_down
- end_movement
+ step_end
@ 81B2557
end
Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
- msgbox Route117_PokemonDayCare_Text_1B2A88, 4
+ msgbox Route117_PokemonDayCare_Text_1B2A88, MSGBOX_DEFAULT
setvar VAR_0x8004, 0
call Route117_PokemonDayCare_EventScript_1B241A
setvar VAR_0x8004, 1
@@ -266,7 +266,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
- msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+ msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT
release
end
@@ -277,14 +277,14 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
copyvar VAR_0x8004, VAR_RESULT
specialvar VAR_RESULT, TakePokemonFromDaycare
- msgbox Route117_PokemonDayCare_Text_1B2B75, 4
- msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+ msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT
+ msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT
release
end
S_EggHatch:: @ 81B25BC
lockall
- msgbox UnknownString_81B2C68, 4
+ msgbox UnknownString_81B2C68, MSGBOX_DEFAULT
special EggHatch
waitstate
releaseall