summaryrefslogtreecommitdiff
path: root/data/scripts/day_care.inc
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-09-24 14:28:51 -0500
committercamthesaxman <cameronghall@cox.net>2017-09-24 14:28:51 -0500
commit86e7bf1fd61b151011038cdb281db3de0a1d9e6a (patch)
tree5a29fa240501cdf4046a4f97e1197cd8c52cf447 /data/scripts/day_care.inc
parentae5ec7f5b05218ba21c53ef632590a5243a7f647 (diff)
Replace more script commands and fix German build
Diffstat (limited to 'data/scripts/day_care.inc')
-rw-r--r--data/scripts/day_care.inc56
1 files changed, 28 insertions, 28 deletions
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index d0e35203e..4c57e0b9f 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -4,11 +4,11 @@ Route117_EventScript_1B222D:: @ 81B222D
special sp0B5_daycare
specialval 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,10 +16,10 @@ 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 sub_8041E7C
@@ -29,7 +29,7 @@ Route117_EventScript_1B2262:: @ 81B2262
Route117_EventScript_1B2298:: @ 81B2298
specialval RESULT, CalculatePlayerPartyCount
compare RESULT, 6
- jumpif 5, Route117_EventScript_1B22B2
+ goto_if 5, Route117_EventScript_1B22B2
msgbox Route117_Text_1B2766, 4
release
end
@@ -49,7 +49,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
Route117_EventScript_1B22CD:: @ 81B22CD
specialval RESULT, sub_8042B4C
compare RESULT, 1
- callif 1, Route117_EventScript_1B22DE
+ call_if 1, Route117_EventScript_1B22DE
return
Route117_EventScript_1B22DE:: @ 81B22DE
@@ -83,14 +83,14 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
faceplayer
specialval 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
@@ -98,16 +98,16 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
specialval 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 ChooseSendDaycareMon
waitstate
compare 0x8004, 255
- jumpeq Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
specialval RESULT, sub_8095C10
compare RESULT, 0
- jumpeq Route117_PokemonDayCare_EventScript_1B23FD
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD
specialval 0x8005, sub_8042328
checksound
pokecry 0x8005, 0
@@ -117,7 +117,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
inccounter GAME_STAT_USED_DAYCARE
specialval RESULT, sp0B6_daycare
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B23DA
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA
release
end
@@ -129,7 +129,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0
Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA
msgbox Route117_PokemonDayCare_Text_1B29AD, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B236C
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B236C
goto Route117_PokemonDayCare_EventScript_1B23D0
end
@@ -155,7 +155,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411
Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
specialval 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,26 +164,26 @@ 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
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469
specialval RESULT, CalculatePlayerPartyCount
compare RESULT, 6
- jumpeq Route117_PokemonDayCare_EventScript_1B2539
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2539
specialval RESULT, sp0B6_daycare
setvar 0x8004, 0
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B24A8
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8
special ShowDaycareLevelMenu
waitstate
copyvar 0x8004, RESULT
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
goto Route117_PokemonDayCare_EventScript_1B24A8
end
@@ -191,14 +191,14 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8
special sub_8041770
msgbox Route117_PokemonDayCare_Text_1B2B49, 5
compare RESULT, 1
- jumpeq Route117_PokemonDayCare_EventScript_1B24C4
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4
goto Route117_PokemonDayCare_EventScript_1B23D0
end
Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4
specialval 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
@@ -216,14 +216,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
waitpokecry
specialval RESULT, sp0B6_daycare
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B2520
+ 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
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
goto Route117_PokemonDayCare_EventScript_1B23D0
end
@@ -265,7 +265,7 @@ 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
@@ -274,7 +274,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
special ShowDaycareLevelMenu
waitstate
compare RESULT, 2
- jumpeq Route117_PokemonDayCare_EventScript_1B23D0
+ goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
copyvar 0x8004, RESULT
specialval RESULT, sub_8041648
msgbox Route117_PokemonDayCare_Text_1B2B75, 4