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/Route1.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
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 f77eb7f1e..42a0a4121 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 4, 12, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSchoolboyDanny, -1 object_event 9, 25, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfQuinn, -1 object_event 3, 7, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route1FruitTree, -1 |