summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route114.inc
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-03 16:22:45 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-03 16:22:45 +0100
commit56f960f67679071712dd7d2cd6140eb8833e7344 (patch)
tree18f9af70a8a591117a7f0a7845d86462537f777c /data/scripts/maps/Route114.inc
parentb5ecdfa404a34c66fdf9f96342a2de0f173e6e73 (diff)
parent397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'data/scripts/maps/Route114.inc')
-rw-r--r--data/scripts/maps/Route114.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index 302c162b0..f6bb6d8ba 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836
Route114_EventScript_15084D:: @ 815084D
trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route114_EventScript_150874
msgbox Route114_Text_1BC337, 6
@@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874
Route114_EventScript_15088B:: @ 815088B
trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route114_EventScript_1508B2
msgbox Route114_Text_1BC4B5, 6