summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route116.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/Route116.inc
parentb5ecdfa404a34c66fdf9f96342a2de0f173e6e73 (diff)
parent397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'data/scripts/maps/Route116.inc')
-rw-r--r--data/scripts/maps/Route116.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index 5fab808bc..4e08705cf 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79
Route116_EventScript_150C90:: @ 8150C90
trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route116_EventScript_150CB7
msgbox Route116_Text_1BD248, 6
@@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5
Route116_EventScript_150CFC:: @ 8150CFC
trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route116_EventScript_150D23
msgbox Route116_Text_1BD3C3, 6