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/ElmsHouse.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/ElmsHouse.asm')
| -rw-r--r-- | maps/ElmsHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 24a3ffd6a..1b2502435 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const ELMSHOUSE_ELMS_WIFE const ELMSHOUSE_ELMS_SON ElmsHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks ElmsWife: jumptextfaceplayer ElmsWifeText @@ -84,17 +84,17 @@ ElmsHousePCText: ElmsHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, NEW_BARK_TOWN, 4 warp_event 3, 7, NEW_BARK_TOWN, 4 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, ElmsHousePC bg_event 6, 1, BGEVENT_READ, ElmsHouseBookshelf bg_event 7, 1, BGEVENT_READ, ElmsHouseBookshelf - db 2 ; object events + def_object_events object_event 1, 5, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ElmsWife, -1 object_event 5, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElmsSon, -1 |