summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route123.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route123.inc')
-rw-r--r--data/scripts/maps/Route123.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc
index e9248c230..14c5a2dba 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/scripts/maps/Route123.inc
@@ -3,22 +3,22 @@ Route123_MapScripts:: @ 8151C53
.byte 0
Route123_MapScript1_151C59:: @ 8151C59
- special 325
+ special SetRoute123Weather
end
Route123_EventScript_151C5D:: @ 8151C5D
lock
faceplayer
checkflag 232
- jumpeq Route123_EventScript_151CAC
+ goto_if_eq Route123_EventScript_151CAC
msgbox Route123_Text_171D83, 4
- special 299
+ special IsGrassTypeInParty
compare RESULT, 0
- jumpeq Route123_EventScript_151CAA
+ goto_if_eq Route123_EventScript_151CAA
msgbox Route123_Text_171DC2, 4
giveitem ITEM_TM19
compare RESULT, 0
- jumpeq Route123_EventScript_1A029B
+ goto_if_eq Route123_EventScript_1A029B
setflag 232
msgbox Route123_Text_171E34, 4
release
@@ -62,9 +62,9 @@ Route123_EventScript_151CFF:: @ 8151CFF
Route123_EventScript_151D16:: @ 8151D16
trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3
- specialval RESULT, 57
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route123_EventScript_151D3D
+ goto_if_eq Route123_EventScript_151D3D
msgbox Route123_Text_1C01B1, 6
end
@@ -75,9 +75,9 @@ Route123_EventScript_151D3D:: @ 8151D3D
Route123_EventScript_151D54:: @ 8151D54
trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303
- specialval RESULT, 57
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route123_EventScript_151D7B
+ goto_if_eq Route123_EventScript_151D7B
msgbox Route123_Text_1C030F, 6
end