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/Route26.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route26.asm')
| -rw-r--r-- | maps/Route26.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route26.asm b/maps/Route26.asm index 7bb3ff25b..77677df5f 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const ROUTE26_COOLTRAINER_M1 const ROUTE26_COOLTRAINER_M2 const ROUTE26_COOLTRAINER_F1 @@ -9,9 +9,9 @@ const ROUTE26_POKE_BALL Route26_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerCooltrainermJake: trainer COOLTRAINERM, JAKE, EVENT_BEAT_COOLTRAINERM_JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script @@ -413,17 +413,17 @@ Route26SignText: Route26_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events warp_event 7, 5, VICTORY_ROAD_GATE, 3 warp_event 15, 57, ROUTE_26_HEAL_HOUSE, 1 warp_event 5, 71, DAY_OF_WEEK_SIBLINGS_HOUSE, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 8, 6, BGEVENT_READ, Route26Sign - db 8 ; object events + def_object_events object_event 14, 24, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainermJake, -1 object_event 9, 38, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermGaven3, -1 object_event 10, 56, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfJoyce, -1 |