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/Route27.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/Route27.asm')
| -rw-r--r-- | maps/Route27.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route27.asm b/maps/Route27.asm index ee0a4f69..dfc7c7fd 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE27_COOLTRAINER_M1 const ROUTE27_COOLTRAINER_M2 const ROUTE27_COOLTRAINER_F1 @@ -10,11 +10,11 @@ const ROUTE27_FISHER Route27_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -428,19 +428,19 @@ TohjoFallsSignText: Route27_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events warp_event 33, 7, ROUTE_27_SANDSTORM_HOUSE, 1 warp_event 26, 5, TOHJO_FALLS, 1 warp_event 36, 5, TOHJO_FALLS, 2 - db 2 ; coord events + def_coord_events coord_event 18, 10, SCENE_DEFAULT, FirstStepIntoKantoLeftScene coord_event 19, 10, SCENE_DEFAULT, FirstStepIntoKantoRightScene - db 1 ; bg events + def_bg_events bg_event 25, 7, BGEVENT_READ, TohjoFallsSign - db 9 ; object events + def_object_events object_event 49, 7, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermBlake, -1 object_event 58, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermBrian, -1 object_event 72, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfReena, -1 |