summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route114.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route114.inc')
-rw-r--r--data/scripts/maps/Route114.inc22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index cfe1dfe7d..0730db23a 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -4,16 +4,16 @@ Route114_MapScripts:: @ 8150732
Route114_EventScript_150733:: @ 8150733
lock
faceplayer
- checkdailyflags
+ dodailyevents
checkflag 2251
- jumpeq Route114_EventScript_150778
+ goto_if_eq Route114_EventScript_150778
msgbox Route114_Text_1C5803, 4
random 5
addvar RESULT, 15
addvar RESULT, 133
giveitem RESULT
compare RESULT, 0
- jumpeq Route114_EventScript_1A029B
+ goto_if_eq Route114_EventScript_1A029B
setflag 2251
msgbox Route114_Text_1C5861, 4
release
@@ -28,11 +28,11 @@ Route114_EventScript_150782:: @ 8150782
lock
faceplayer
checkflag 231
- jumpeq Route114_EventScript_1507B9
+ goto_if_eq Route114_EventScript_1507B9
msgbox Route114_Text_170154, 4
giveitem ITEM_TM05
compare RESULT, 0
- jumpeq Route114_EventScript_1A029B
+ goto_if_eq Route114_EventScript_1A029B
setflag 231
msgbox Route114_Text_1701C5, 4
release
@@ -46,8 +46,8 @@ Route114_EventScript_1507B9:: @ 81507B9
Route114_EventScript_1507C3:: @ 81507C3
lock
faceplayer
- checksound
- pokecry SPECIES_POOCHYENA, 2
+ waitse
+ playpokecry SPECIES_POOCHYENA, 2
msgbox Route114_Text_1701F9, 4
waitpokecry
release
@@ -87,9 +87,9 @@ Route114_EventScript_150836:: @ 8150836
Route114_EventScript_15084D:: @ 815084D
trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route114_EventScript_150874
+ goto_if_eq Route114_EventScript_150874
msgbox Route114_Text_1BC337, 6
end
@@ -100,9 +100,9 @@ Route114_EventScript_150874:: @ 8150874
Route114_EventScript_15088B:: @ 815088B
trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route114_EventScript_1508B2
+ goto_if_eq Route114_EventScript_1508B2
msgbox Route114_Text_1BC4B5, 6
end