summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route124.inc
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-12-22 01:22:16 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-12-22 01:22:16 -0600
commit6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch)
treef71ad889881572488c2a2be299c50fc09393e1a2 /data/scripts/maps/Route124.inc
parent0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff)
parent4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff)
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'data/scripts/maps/Route124.inc')
-rw-r--r--data/scripts/maps/Route124.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc
index 2a0298650..2079c338d 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/scripts/maps/Route124.inc
@@ -23,8 +23,8 @@ Route124_EventScript_1F659C:: @ 81F659C
Route124_EventScript_1F65B3:: @ 81F65B3
trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF
- specialvar VAR_RESULT, sub_80B226C
- compare_var_to_value VAR_RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_eq Route124_EventScript_1F65FE
msgbox Route124_Text_2A0B9A, 4
release
@@ -58,8 +58,8 @@ Route124_EventScript_1F662C:: @ 81F662C
Route124_EventScript_1F6643:: @ 81F6643
trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673
- specialvar VAR_RESULT, sub_80B226C
- compare_var_to_value VAR_RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_eq Route124_EventScript_1F668C
msgbox Route124_Text_2A0F3A, 4
release
@@ -81,8 +81,8 @@ Route124_EventScript_1F668C:: @ 81F668C
Route124_EventScript_1F66A7:: @ 81F66A7
trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7
- specialvar VAR_RESULT, sub_80B226C
- compare_var_to_value VAR_RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_eq Route124_EventScript_1F66F0
msgbox Route124_Text_2A103E, 4
release