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/Route5.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route5.asm')
| -rw-r--r-- | maps/Route5.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route5.asm b/maps/Route5.asm index 5806ddb91..ae2912bd8 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE5_POKEFAN_M Route5_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route5PokefanMScript: jumptextfaceplayer Route5PokefanMText @@ -40,17 +40,17 @@ HouseForSaleSignText: Route5_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 17, 15, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, 1 warp_event 8, 17, ROUTE_5_SAFFRON_GATE, 1 warp_event 9, 17, ROUTE_5_SAFFRON_GATE, 2 warp_event 10, 11, ROUTE_5_CLEANSE_TAG_HOUSE, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 17, 17, BGEVENT_READ, Route5UndergroundPathSign bg_event 10, 11, BGEVENT_READ, HouseForSaleSign - db 1 ; object events + def_object_events object_event 17, 16, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5PokefanMScript, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH |