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/AzaleaMart.asm | |
parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/AzaleaMart.asm')
-rw-r--r-- | maps/AzaleaMart.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index c6d8fbbb..26d7d279 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const AZALEAMART_CLERK const AZALEAMART_COOLTRAINER_M const AZALEAMART_BUG_CATCHER AzaleaMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks AzaleaMartClerkScript: opentext @@ -46,15 +46,15 @@ AzaleaMartBugCatcherText: AzaleaMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, AZALEA_TOWN, 3 warp_event 3, 7, AZALEA_TOWN, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 3 ; object events + def_object_events object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartClerkScript, -1 object_event 2, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaMartCooltrainerMScript, -1 object_event 7, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaMartBugCatcherScript, -1 |