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/SoulHouse.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/SoulHouse.asm')
| -rw-r--r-- | maps/SoulHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 314900518..f23c59215 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const SOULHOUSE_MRFUJI const SOULHOUSE_TEACHER const SOULHOUSE_LASS const SOULHOUSE_GRANNY SoulHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MrFuji: jumptextfaceplayer MrFujiText @@ -73,15 +73,15 @@ SoulHouseGrannyText: SoulHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, LAVENDER_TOWN, 6 warp_event 5, 7, LAVENDER_TOWN, 6 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 4, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, MrFuji, -1 object_event 7, 3, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseTeacherScript, -1 object_event 2, 5, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SoulHouseLassScript, -1 |