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/FastShipB1F.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/FastShipB1F.asm')
| -rw-r--r-- | maps/FastShipB1F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index b10c1921b..34f938314 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const FASTSHIPB1F_SAILOR1 const FASTSHIPB1F_SAILOR2 const FASTSHIPB1F_SAILOR3 @@ -13,11 +13,11 @@ const FASTSHIPB1F_YOUNGSTER2 FastShipB1F_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 0 ; callbacks + def_callbacks .DummyScene0: end @@ -449,18 +449,18 @@ SchoolboyRickyAfterBattleText: FastShipB1F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 5, 11, FAST_SHIP_1F, 11 warp_event 31, 13, FAST_SHIP_1F, 12 - db 2 ; coord events + def_coord_events coord_event 30, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight - db 1 ; bg events + def_bg_events bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan - db 12 ; object events + def_object_events object_event 30, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_LEFT object_event 31, 6, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FastShipB1FSailorScript, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT object_event 9, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP |