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/Route1.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/Route1.asm')
| -rw-r--r-- | maps/Route1.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route1.asm b/maps/Route1.asm index d277670f..58ebd382 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE1_YOUNGSTER const ROUTE1_COOLTRAINER_F const ROUTE1_FRUIT_TREE Route1_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerSchoolboyDanny: trainer SCHOOLBOY, DANNY, EVENT_BEAT_SCHOOLBOY_DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script @@ -81,14 +81,14 @@ Route1SignText: Route1_MapEvents: db 0, 0 ; filler - db 0 ; warp events + def_warp_events - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 7, 27, BGEVENT_READ, Route1Sign - db 3 ; object events + def_object_events object_event 7, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSchoolboyDanny, -1 object_event 3, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfQuinn, -1 object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route1FruitTree, -1 |