diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/VermilionPort.asm | |
parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/VermilionPort.asm')
-rw-r--r-- | maps/VermilionPort.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 626f7090..a5c6d309 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const VERMILIONPORT_SAILOR1 const VERMILIONPORT_SAILOR2 const VERMILIONPORT_SUPER_NERD VermilionPort_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -299,17 +299,17 @@ VermilionPortSuperNerdText: VermilionPort_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 9, 5, VERMILION_PORT_PASSAGE, 5 warp_event 7, 17, FAST_SHIP_1F, 1 - db 1 ; coord events + def_coord_events coord_event 7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript - db 1 ; bg events + def_bg_events bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron - db 3 ; object events + def_object_events object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangwayScript, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorScript, -1 object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSuperNerdScript, -1 |