summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route118.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/Route118.inc')
-rw-r--r--data/scripts/maps/Route118.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index ca69e01c4..63decb5d6 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5
Route118_EventScript_150FAE:: @ 8150FAE
lockall
- setvar 0x8008, 0
+ setvar VAR_SPECIAL_8, 0
applymovement 255, Route118_Movement_1A0841
waitmovement 0
applymovement 19, Route118_Movement_151069
@@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE
Route118_EventScript_150FCE:: @ 8150FCE
lockall
- setvar 0x8008, 1
+ setvar VAR_SPECIAL_8, 1
applymovement 255, Route118_Movement_1A0841
waitmovement 0
goto Route118_EventScript_151004
@@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE
Route118_EventScript_150FE4:: @ 8150FE4
lockall
- setvar 0x8008, 2
+ setvar VAR_SPECIAL_8, 2
applymovement 255, Route118_Movement_1A0841
waitmovement 0
applymovement 19, Route118_Movement_15106B
@@ -83,13 +83,13 @@ Route118_EventScript_151004:: @ 8151004
delay 30
msgbox Route118_Text_170D66, 4
closemessage
- compare 0x8008, 0
+ compare VAR_SPECIAL_8, 0
call_if 1, Route118_EventScript_151048
- compare 0x8008, 1
+ compare VAR_SPECIAL_8, 1
call_if 1, Route118_EventScript_151053
- compare 0x8008, 2
+ compare VAR_SPECIAL_8, 2
call_if 1, Route118_EventScript_15105E
- setvar 0x4071, 1
+ setvar VAR_ROUTE118_STATE, 1
removeobject 19
releaseall
end
@@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086
Route118_EventScript_15108F:: @ 815108F
trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route118_EventScript_1510B6
msgbox Route118_Text_1BE05E, 6
@@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4
Route118_EventScript_1510FB:: @ 81510FB
trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route118_EventScript_151122
msgbox Route118_Text_1BE413, 6