summaryrefslogtreecommitdiff
path: root/data/scripts/maps/Route125.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-10-09 10:23:23 -0700
committerMarcus Huderle <huderlem@gmail.com>2017-10-09 10:40:04 -0700
commit72beb410f423cafd35989c0b8dd4c52860cf80f8 (patch)
tree155aa1e2c39ebd504e095bc8c1dc218aad3acdc4 /data/scripts/maps/Route125.inc
parenta871ce87a74421df64a9ad381d37dc32ff9bdc6d (diff)
parent3e03d362fae398fa56c4a6e45d7b999772d0803f (diff)
Merge remote-tracking branch 'upstream/master' into party_menu
Diffstat (limited to 'data/scripts/maps/Route125.inc')
-rw-r--r--data/scripts/maps/Route125.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc
index a5d2457d5..489a7314b 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/scripts/maps/Route125.inc
@@ -4,7 +4,7 @@ Route125_MapScripts:: @ 8151F1E
Route125_MapScript1_151F24:: @ 8151F24
checkflag 2090
- callif 1, Route125_EventScript_1A02C1
+ call_if 1, Route125_EventScript_1A02C1
end
Route125_EventScript_151F2E:: @ 8151F2E
@@ -29,9 +29,9 @@ Route125_EventScript_151F73:: @ 8151F73
Route125_EventScript_151F8A:: @ 8151F8A
trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED
- specialval RESULT, sub_8082C68
+ specialvar RESULT, sub_8082C68
compare RESULT, 1
- jumpeq Route125_EventScript_151FB1
+ goto_if_eq Route125_EventScript_151FB1
msgbox Route125_Text_1C1208, 6
end