diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/Route46.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/Route46.asm')
| -rw-r--r-- | maps/Route46.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route46.asm b/maps/Route46.asm index 0a37485d..da0ec5f2 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE46_POKEFAN_M const ROUTE46_YOUNGSTER const ROUTE46_LASS @@ -7,9 +7,9 @@ const ROUTE46_POKE_BALL Route46_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerCamperTed: trainer CAMPER, TED, EVENT_BEAT_CAMPER_TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script @@ -195,17 +195,17 @@ Route46SignText: Route46_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events warp_event 7, 33, ROUTE_29_ROUTE_46_GATE, 1 warp_event 8, 33, ROUTE_29_ROUTE_46_GATE, 2 warp_event 14, 5, DARK_CAVE_VIOLET_ENTRANCE, 3 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 9, 27, BGEVENT_READ, Route46Sign - db 6 ; object events + def_object_events object_event 12, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 object_event 3, 13, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerCamperTed, -1 object_event 1, 15, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerErin1, -1 |