summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route110.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route110.inc')
-rw-r--r--data/scripts/maps/Route110.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index 55c8f67df..d8c19d92c 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -5,7 +5,7 @@ Route110_MapScripts:: @ 814F900
.byte 0
Route110_MapScript1_14F910:: @ 814F910
- special 229
+ special UpdateCyclingRoadState
end
Route110_MapScript1_14F914:: @ 814F914
@@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933
.2byte 0
Route110_EventScript_14F93D:: @ 814F93D
- special 226
+ special BeginCyclingRoadChallenge
setvar 0x40a9, 2
return
@@ -131,7 +131,7 @@ Route110_EventScript_14FA25:: @ 814FA25
Route110_EventScript_14FA2E:: @ 814FA2E
lockall
- specialval RESULT, 225
+ specialval RESULT, GetRecordedCyclingRoadResults
compare RESULT, 0
jumpeq Route110_EventScript_14FA49
msgbox Route110_Text_16F53A, 4
@@ -146,7 +146,7 @@ Route110_EventScript_14FA49:: @ 814FA49
Route110_EventScript_14FA53:: @ 814FA53
lock
faceplayer
- specialval RESULT, 227
+ specialval RESULT, GetPlayerAvatarBike
compare RESULT, 1
jumpeq Route110_EventScript_14FA84
compare 0x40a9, 0
@@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5
Route110_EventScript_14FABC:: @ 814FABC
trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FAE3
msgbox Route110_Text_1BA829, 6
@@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28
Route110_EventScript_14FB3F:: @ 814FB3F
trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FB66
msgbox Route110_Text_1BA3A5, 6
@@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D
Route110_EventScript_14FB94:: @ 814FB94
trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FBBB
msgbox Route110_Text_1BA52E, 6
@@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB
Route110_EventScript_14FBD2:: @ 814FBD2
trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
- specialval RESULT, 57
+ specialval RESULT, sub_8082C68
compare RESULT, 1
jumpeq Route110_EventScript_14FBF9
msgbox Route110_Text_1BA9E9, 6
@@ -261,7 +261,7 @@ Route110_EventScript_14FC27:: @ 814FC27
end
Route110_EventScript_14FC39:: @ 814FC39
- special 228
+ special FinishCyclingRoadChallenge
msgbox Route110_Text_16EF65, 4
switch RESULT
case 10, Route110_EventScript_14FCC3