diff options
Diffstat (limited to 'maps/Route29.asm')
| -rw-r--r-- | maps/Route29.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm index 8273a4fc..4b8d6bb1 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE29_COOLTRAINER_M1 const ROUTE29_YOUNGSTER const ROUTE29_TEACHER1 @@ -9,11 +9,11 @@ const ROUTE29_POKE_BALL Route29_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .Tuscany .DummyScene0: @@ -416,18 +416,18 @@ Route29Sign2Text: Route29_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 27, 1, ROUTE_29_ROUTE_46_GATE, 3 - db 2 ; coord events + def_coord_events coord_event 53, 8, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial1 coord_event 53, 9, SCENE_ROUTE29_CATCH_TUTORIAL, Route29Tutorial2 - db 2 ; bg events + def_bg_events bg_event 51, 7, BGEVENT_READ, Route29Sign1 bg_event 3, 5, BGEVENT_READ, Route29Sign2 - db 8 ; object events + def_object_events object_event 50, 12, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CatchingTutorialDudeScript, -1 object_event 27, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29YoungsterScript, -1 object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 |