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/SaffronMagnetTrainStation.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/SaffronMagnetTrainStation.asm')
| -rw-r--r-- | maps/SaffronMagnetTrainStation.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 8c77bbde..f75f2223 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONMAGNETTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_GYM_GUIDE const SAFFRONMAGNETTRAINSTATION_TEACHER const SAFFRONMAGNETTRAINSTATION_LASS SaffronMagnetTrainStation_MapScripts: - db 1 ; scene scripts + def_scene_scripts scene_script .DummyScene ; SCENE_DEFAULT - db 0 ; callbacks + def_callbacks .DummyScene: end @@ -210,18 +210,18 @@ SaffronMagnetTrainStationLassText: SaffronMagnetTrainStation_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 8, 17, SAFFRON_CITY, 6 warp_event 9, 17, SAFFRON_CITY, 6 warp_event 6, 5, GOLDENROD_MAGNET_TRAIN_STATION, 4 warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3 - db 1 ; coord events + def_coord_events coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1 object_event 10, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuideScript, -1 object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION |