summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route117.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-01-01 19:03:47 -0800
committerGitHub <noreply@github.com>2018-01-01 19:03:47 -0800
commit397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (patch)
treeb4c05276d2e5d65f5bf7cf55a054947c92235f8e /data/scripts/maps/Route117.inc
parent79a9ff94719b5397647ddf11efc1d3dc1d388e1d (diff)
parent664b42470fb6c590dd2bd8b02707a790feda23fe (diff)
Merge pull request #503 from huderlem/specials
Label a bunch of specials
Diffstat (limited to 'data/scripts/maps/Route117.inc')
-rw-r--r--data/scripts/maps/Route117.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 44c4c156c..fa648f79e 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84
Route117_EventScript_150D8D:: @ 8150D8D
trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route117_EventScript_150DB4
msgbox Route117_Text_1BD4F9, 6
@@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4
Route117_EventScript_150DCB:: @ 8150DCB
trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route117_EventScript_150DF2
msgbox Route117_Text_1BD69B, 6
@@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2
Route117_EventScript_150E09:: @ 8150E09
trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route117_EventScript_150E30
msgbox Route117_Text_1BD7F5, 6
@@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30
Route117_EventScript_150E47:: @ 8150E47
trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route117_EventScript_150E6E
msgbox Route117_Text_1BD98F, 6
@@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85
Route117_EventScript_150E9C:: @ 8150E9C
trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route117_EventScript_150EC7
msgbox Route117_Text_1BDC44, 6
@@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7
Route117_EventScript_150EE2:: @ 8150EE2
trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B
- specialvar RESULT, sub_8082C68
+ specialvar RESULT, ShouldTryRematchBattle
compare RESULT, 1
goto_if_eq Route117_EventScript_150F0D
msgbox Route117_Text_1BDD4E, 6