summaryrefslogtreecommitdiff
path: root/data/maps/Route124/scripts.inc
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-12-14 11:56:41 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-12-14 11:56:41 -0500
commit04d158cfcd0f26b4dc4a00e23464a5fde201aa8e (patch)
tree5722c829dbad65bbbeb573084291ba0621b89df5 /data/maps/Route124/scripts.inc
parentd23c1af73e98f3bd91b4551bf624638a33bbe236 (diff)
parent103b63bd1a0a8a00733834de1f5094507e070de9 (diff)
Merge branch 'master' of github.com:pret/pokeruby into modern_gcc
Diffstat (limited to 'data/maps/Route124/scripts.inc')
-rw-r--r--data/maps/Route124/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index cb42e1944..8232dee34 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -22,8 +22,8 @@ Route124_EventScript_151E0F:: @ 8151E0F
Route124_EventScript_151E26:: @ 8151E26
trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9
- specialvar RESULT, ShouldTryRematchBattle
- compare RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_if_eq Route124_EventScript_151E4D
msgbox Route124_Text_1C080E, 6
end
@@ -45,8 +45,8 @@ Route124_EventScript_151E7B:: @ 8151E7B
Route124_EventScript_151E92:: @ 8151E92
trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8
- specialvar RESULT, ShouldTryRematchBattle
- compare RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_if_eq Route124_EventScript_151EBD
msgbox Route124_Text_1C0B72, 6
end
@@ -58,8 +58,8 @@ Route124_EventScript_151EBD:: @ 8151EBD
Route124_EventScript_151ED8:: @ 8151ED8
trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0
- specialvar RESULT, ShouldTryRematchBattle
- compare RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_if_eq Route124_EventScript_151F03
msgbox Route124_Text_1C0C7F, 6
end