diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/Route18.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route18.asm')
| -rw-r--r-- | maps/Route18.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route18.asm b/maps/Route18.asm index af529282d..ecad39368 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ROUTE18_YOUNGSTER1 const ROUTE18_YOUNGSTER2 Route18_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperBoris: trainer BIRD_KEEPER, BORIS, EVENT_BEAT_BIRD_KEEPER_BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script @@ -78,15 +78,15 @@ Route18SignText: Route18_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 6, ROUTE_17_ROUTE_18_GATE, 3 warp_event 2, 7, ROUTE_17_ROUTE_18_GATE, 4 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 9, 5, BGEVENT_READ, Route18Sign - db 2 ; object events + def_object_events object_event 9, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 object_event 13, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 |