summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route114.inc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-04 18:50:53 -0500
commiteff6795887cc27f2c5139df9a6da70f4f02338b4 (patch)
treef91be2b0b7194b4ddff13f4935a0edafc4284a43 /data/scripts/maps/Route114.inc
parent3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff)
parentb1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff)
Merge branch 'master' into unk_text_8095904
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