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/LancesRoom.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/LancesRoom.asm')
| -rw-r--r-- | maps/LancesRoom.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index b98da1c7..6808e423 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const LANCESROOM_LANCE const LANCESROOM_MARY const LANCESROOM_OAK LancesRoom_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .LockDoor ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_TILES, .LancesRoomDoors .LockDoor: @@ -342,19 +342,19 @@ LancesRoomMaryNoInterviewText: LancesRoom_MapEvents: db 0, 0 ; filler - db 4 ; warp events + def_warp_events warp_event 4, 23, KARENS_ROOM, 3 warp_event 5, 23, KARENS_ROOM, 4 warp_event 4, 0, HALL_OF_FAME, 1 warp_event 5, 0, HALL_OF_FAME, 2 - db 2 ; coord events + def_coord_events coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 5, 2, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1 object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY |