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/TrainerHouse1F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/TrainerHouse1F.asm')
| -rw-r--r-- | maps/TrainerHouse1F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index d38b45112..fbf544970 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const TRAINERHOUSE1F_RECEPTIONIST const TRAINERHOUSE1F_COOLTRAINER_M const TRAINERHOUSE1F_COOLTRAINER_F @@ -6,9 +6,9 @@ const TRAINERHOUSE1F_GENTLEMAN TrainerHouse1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerHouse1FReceptionistScript: jumptextfaceplayer TrainerHouse1FReceptionistText @@ -138,19 +138,19 @@ TrainerHouseIllegibleText: TrainerHouse1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events warp_event 2, 13, VIRIDIAN_CITY, 3 warp_event 3, 13, VIRIDIAN_CITY, 3 warp_event 8, 2, TRAINER_HOUSE_B1F, 1 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 5, 0, BGEVENT_READ, TrainerHouseSign1 bg_event 7, 0, BGEVENT_READ, TrainerHouseSign2 bg_event 7, 10, BGEVENT_READ, TrainerHouseIllegibleBook - db 5 ; object events + def_object_events object_event 0, 11, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FReceptionistScript, -1 object_event 7, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerMScript, -1 object_event 6, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerHouse1FCooltrainerFScript, -1 |