summaryrefslogtreecommitdiff
path: root/maps/Route2Gate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route2Gate.asm')
-rw-r--r--maps/Route2Gate.asm33
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm
index 60585b267..1b665799f 100644
--- a/maps/Route2Gate.asm
+++ b/maps/Route2Gate.asm
@@ -1,12 +1,10 @@
-const_value set 2
+ const_def 2 ; object constants
const ROUTE2GATE_SCIENTIST
Route2Gate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route2GateScientistScript:
jumptextfaceplayer Route2GateScientistText
@@ -26,22 +24,17 @@ Route2GateScientistText:
done
Route2Gate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
- warp_def 4, 0, 3, ROUTE_2
- warp_def 5, 0, 4, ROUTE_2
- warp_def 4, 7, 2, ROUTE_2
- warp_def 5, 7, 2, ROUTE_2
+ db 4 ; warp events
+ warp_event 4, 0, ROUTE_2, 3
+ warp_event 5, 0, ROUTE_2, 4
+ warp_event 4, 7, ROUTE_2, 2
+ warp_event 5, 7, ROUTE_2, 2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
- object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1
+ db 1 ; object events
+ object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route2GateScientistScript, -1