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/Route17.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route17.asm')
| -rw-r--r-- | maps/Route17.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route17.asm b/maps/Route17.asm index fae28f684..098895db9 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE17_BIKER1 const ROUTE17_BIKER2 const ROUTE17_BIKER3 const ROUTE17_BIKER4 Route17_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .AlwaysOnBike .AlwaysOnBike: @@ -133,17 +133,17 @@ BikerCharlesAfterBattleText: Route17_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 17, 82, ROUTE_17_ROUTE_18_GATE, 1 warp_event 17, 83, ROUTE_17_ROUTE_18_GATE, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 9, 54, BGEVENT_ITEM, Route17HiddenMaxEther bg_event 8, 77, BGEVENT_ITEM, Route17HiddenMaxElixer - db 4 ; object events + def_object_events object_event 4, 17, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerBikerRiley, -1 object_event 9, 68, SPRITE_BIKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerBikerJoel, -1 object_event 3, 53, SPRITE_BIKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBikerGlenn, -1 |