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/Route46.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
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 27f1180e0..4418595d1 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 @@ -251,17 +251,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, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerBailey, -1 object_event 4, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperTed, -1 object_event 2, 13, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerErin1, -1 |