summaryrefslogtreecommitdiff
path: root/data/maps/Route18
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 19:16:45 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 19:16:57 -0500
commit2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 (patch)
treeefaa59d9de2fa1df7621d859b6c0f2ebc91ebd8b /data/maps/Route18
parent31d31d326034fde26dedaf2dadb1c608e00fb92f (diff)
Use map_script constants, name unique map_script labels
Diffstat (limited to 'data/maps/Route18')
-rw-r--r--data/maps/Route18/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc
index b50bf30c1..f3e1f1032 100644
--- a/data/maps/Route18/scripts.inc
+++ b/data/maps/Route18/scripts.inc
@@ -1,9 +1,9 @@
Route18_MapScripts:: @ 81681F6
- map_script 3, Route18_MapScript1_168201
- map_script 4, Route18_MapScript2_168211
+ map_script MAP_SCRIPT_ON_TRANSITION, Route18_OnTransition
+ map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route18_OnWarp
.byte 0
-Route18_MapScript1_168201:: @ 8168201
+Route18_OnTransition:: @ 8168201
compare VAR_MAP_SCENE_ROUTE16, 1
call_if eq, EventScript_16820D
end
@@ -12,7 +12,7 @@ EventScript_16820D:: @ 816820D
setflag FLAG_SYS_ON_CYCLING_ROAD
return
-Route18_MapScript2_168211:: @ 8168211
+Route18_OnWarp:: @ 8168211
map_script_2 VAR_MAP_SCENE_ROUTE16, 1, EventScript_16821B
.2byte 0