summaryrefslogtreecommitdiff
path: root/maps/Route29Route46Gate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route29Route46Gate.asm')
-rw-r--r--maps/Route29Route46Gate.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm
index 46f34df1f..b0bdd7bba 100644
--- a/maps/Route29Route46Gate.asm
+++ b/maps/Route29Route46Gate.asm
@@ -1,11 +1,11 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE29ROUTE46GATE_OFFICER
const ROUTE29ROUTE46GATE_YOUNGSTER
Route29Route46Gate_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
Route29Route46GateOfficerScript:
jumptextfaceplayer Route29Route46GateOfficerText
@@ -37,16 +37,16 @@ Route29Route46GateYoungsterText:
Route29Route46Gate_MapEvents:
db 0, 0 ; filler
- db 4 ; warp events
+ def_warp_events
warp_event 4, 0, ROUTE_46, 1
warp_event 5, 0, ROUTE_46, 2
warp_event 4, 7, ROUTE_29, 1
warp_event 5, 7, ROUTE_29, 1
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 2 ; object events
+ def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29Route46GateOfficerScript, -1
object_event 6, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29Route46GateYoungsterScript, -1