summaryrefslogtreecommitdiff
path: root/data/scripts/day_care.inc
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-10-16 14:12:59 -0400
committerscnorton <scnorton@biociphers.org>2017-10-16 14:12:59 -0400
commita6d2bfaebd16940fc0ac1be3ca29caf0888296ca (patch)
tree7ec979bc8481b2c2d55874aef3e9004ddb715781 /data/scripts/day_care.inc
parent96ebc5d46287e33df7bda74a6fb340281cdaa4c5 (diff)
parent7d657ef56716fd01bacf4a47df50ad0ec3d03b10 (diff)
Merge branch 'master' into secret_base
Diffstat (limited to 'data/scripts/day_care.inc')
-rw-r--r--data/scripts/day_care.inc150
1 files changed, 75 insertions, 75 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 1e248ba9f..f8151b86a 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,14 +1,14 @@
Route117_EventScript_1B222D:: @ 81B222D
lock
faceplayer
- special 181
- specialval RESULT, 182
+ special sp0B5_daycare
+ specialvar RESULT, sp0B6_daycare
compare RESULT, 1
- jumpeq Route117_EventScript_1B2262
+ goto_if_eq Route117_EventScript_1B2262
compare RESULT, 2
- jumpeq Route117_EventScript_1B22E7
+ goto_if_eq Route117_EventScript_1B22E7
compare RESULT, 3
- jumpeq Route117_EventScript_1B22FE
+ goto_if_eq Route117_EventScript_1B22FE
msgbox Route117_Text_1B25CB, 4
release
end
@@ -16,40 +16,40 @@ Route117_EventScript_1B222D:: @ 81B222D
Route117_EventScript_1B2262:: @ 81B2262
msgbox Route117_Text_1B2659, 5
compare RESULT, 1
- jumpeq Route117_EventScript_1B2298
+ goto_if_eq Route117_EventScript_1B2298
msgbox Route117_Text_1B28C4, 5
compare RESULT, 1
- jumpeq Route117_EventScript_1B2298
+ goto_if_eq Route117_EventScript_1B2298
msgbox Route117_Text_1B2745, 4
clearflag 134
- special 183
+ special sub_8041E7C
release
end
Route117_EventScript_1B2298:: @ 81B2298
- specialval RESULT, 131
+ specialvar RESULT, CalculatePlayerPartyCount
compare RESULT, 6
- jumpif 5, Route117_EventScript_1B22B2
+ goto_if 5, Route117_EventScript_1B22B2
msgbox Route117_Text_1B2766, 4
release
end
Route117_EventScript_1B22B2:: @ 81B22B2
message Route117_Text_1B27A2
- fanfare 367
+ playfanfare 367
waitfanfare
- waittext
+ waitmessage
waitbutton
msgbox Route117_Text_1B27CD, 4
- special 184
+ special sp0B8_daycare
clearflag 134
release
end
Route117_EventScript_1B22CD:: @ 81B22CD
- specialval RESULT, 195
+ specialvar RESULT, sub_8042B4C
compare RESULT, 1
- callif 1, Route117_EventScript_1B22DE
+ call_if 1, Route117_EventScript_1B22DE
return
Route117_EventScript_1B22DE:: @ 81B22DE
@@ -57,7 +57,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE
return
Route117_EventScript_1B22E7:: @ 81B22E7
- special 181
+ special sp0B5_daycare
msgbox Route117_Text_1B2710, 4
setvar 0x8004, 0
call Route117_EventScript_1B22CD
@@ -65,11 +65,11 @@ Route117_EventScript_1B22E7:: @ 81B22E7
end
Route117_EventScript_1B22FE:: @ 81B22FE
- special 181
+ special sp0B5_daycare
msgbox Route117_Text_1B2897, 4
- special 185
- special 141
- waittext
+ special sp0B9_daycare_relationship_comment
+ special ShowFieldMessageStringVar4
+ waitmessage
waitbutton
setvar 0x8004, 0
call Route117_EventScript_1B22CD
@@ -81,43 +81,43 @@ Route117_EventScript_1B22FE:: @ 81B22FE
Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
lock
faceplayer
- specialval RESULT, 182
+ specialvar RESULT, sp0B6_daycare
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B2407
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2407
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B242B
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B242B
compare RESULT, 3
- jumpeq Route117_PokemonDayCare_EventScript_1B2558
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2558
msgbox Route117_PokemonDayCare_Text_1B28F2, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B236C
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B236C
msgbox Route117_PokemonDayCare_Text_1B2A14, 4
release
end
Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
- specialval RESULT, 132
+ specialvar RESULT, sub_8095B6C
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B23F3
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3
msgbox Route117_PokemonDayCare_Text_1B2947, 4
fadescreen 1
- special 188
+ special ChooseSendDaycareMon
waitstate
compare 0x8004, 255
- jumpeq Route117_PokemonDayCare_EventScript_1B23D0
- specialval RESULT, 133
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
+ specialvar RESULT, sub_8095C10
compare RESULT, 0
- jumpeq Route117_PokemonDayCare_EventScript_1B23FD
- specialval 0x8005, 186
- checksound
- pokecry 0x8005, 0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD
+ specialvar 0x8005, sub_8042328
+ waitse
+ playpokecry 0x8005, 0
msgbox Route117_PokemonDayCare_Text_1B296E, 4
waitpokecry
- special 187
- inccounter GAME_STAT_USED_DAYCARE
- specialval RESULT, 182
+ special Daycare_SendPokemon_Special
+ incrementgamestat GAME_STAT_USED_DAYCARE
+ specialvar RESULT, sp0B6_daycare
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B23DA
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA
release
end
@@ -129,8 +129,8 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0
Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA
msgbox Route117_PokemonDayCare_Text_1B29AD, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B236C
- jump Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B236C
+ goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B23F3:: @ 81B23F3
@@ -153,9 +153,9 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411
return
Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
- specialval RESULT, 190
+ specialvar RESULT, sub_80417B8
compare RESULT, 0
- callif 5, Route117_PokemonDayCare_EventScript_1B2411
+ call_if 5, Route117_PokemonDayCare_EventScript_1B2411
return
Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B
@@ -164,67 +164,67 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B
call Route117_PokemonDayCare_EventScript_1B241A
msgbox Route117_PokemonDayCare_Text_1B29AD, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B236C
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B236C
msgbox Route117_PokemonDayCare_Text_1B2BF6, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B2469
- jump Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
+ goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469
- specialval RESULT, 131
+ specialvar RESULT, CalculatePlayerPartyCount
compare RESULT, 6
- jumpeq Route117_PokemonDayCare_EventScript_1B2539
- specialval RESULT, 182
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2539
+ specialvar RESULT, sp0B6_daycare
setvar 0x8004, 0
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B24A8
- special 189
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8
+ special ShowDaycareLevelMenu
waitstate
copyvar 0x8004, RESULT
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B23D0
- jump Route117_PokemonDayCare_EventScript_1B24A8
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
+ goto Route117_PokemonDayCare_EventScript_1B24A8
end
Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8
- special 191
+ special sub_8041770
msgbox Route117_PokemonDayCare_Text_1B2B49, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B24C4
- jump Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4
+ goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4
- specialval RESULT, 197
+ specialvar RESULT, sub_80B7CE8
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B24DE
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE
msgbox Route117_PokemonDayCare_Text_1B2A30, 4
release
end
Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
- move 1, Route117_PokemonDayCare_Movement_1B2543
- waitmove 0
- specialval RESULT, 192
- special 198
- playsfx 95
+ applymovement 1, Route117_PokemonDayCare_Movement_1B2543
+ waitmovement 0
+ specialvar RESULT, sub_8041648
+ special sub_80B7D0C
+ playse 95
msgbox Route117_PokemonDayCare_Text_1B2B75, 4
- checksound
- pokecry RESULT, 0
+ waitse
+ playpokecry RESULT, 0
msgbox Route117_PokemonDayCare_Text_1B2B93, 4
waitpokecry
- specialval RESULT, 182
+ specialvar RESULT, sp0B6_daycare
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B2520
- jump Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2520
+ goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520
msgbox Route117_PokemonDayCare_Text_1B2A4F, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B2469
- jump Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
+ goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539
@@ -265,27 +265,27 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
call Route117_PokemonDayCare_EventScript_1B241A
msgbox Route117_PokemonDayCare_Text_1B2BF6, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B2469
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
msgbox Route117_PokemonDayCare_Text_1B2A76, 4
release
end
@ 81B2591
- special 189
+ special ShowDaycareLevelMenu
waitstate
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
copyvar 0x8004, RESULT
- specialval RESULT, 192
+ specialvar RESULT, sub_8041648
msgbox Route117_PokemonDayCare_Text_1B2B75, 4
msgbox Route117_PokemonDayCare_Text_1B2A76, 4
release
end
-Event_EggHatch:: @ 81B25BC
+S_EggHatch:: @ 81B25BC
lockall
msgbox UnknownString_81B2C68, 4
- special 194
+ special EggHatch
waitstate
releaseall
end