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/Route33.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route33.asm')
| -rw-r--r-- | maps/Route33.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route33.asm b/maps/Route33.asm index daf4224d9..389f8658a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE33_POKEFAN_M const ROUTE33_LASS const ROUTE33_FRUIT_TREE Route33_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route33LassScript: jumptextfaceplayer Route33LassText @@ -195,15 +195,15 @@ Route33SignText: Route33_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 11, 9, UNION_CAVE_1F, 3 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 11, 11, BGEVENT_READ, Route33Sign - db 3 ; object events + def_object_events object_event 6, 13, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerHikerAnthony, -1 object_event 13, 16, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route33LassScript, -1 object_event 14, 16, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route33FruitTree, -1 |