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/BlackthornMart.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/BlackthornMart.asm')
| -rw-r--r-- | maps/BlackthornMart.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index a05ae1eb..3c8b0a38 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const BLACKTHORNMART_CLERK const BLACKTHORNMART_COOLTRAINER_M const BLACKTHORNMART_BLACK_BELT BlackthornMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks BlackthornMartClerkScript: opentext @@ -47,15 +47,15 @@ BlackthornMartBlackBeltText: BlackthornMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, BLACKTHORN_CITY, 4 warp_event 3, 7, BLACKTHORN_CITY, 4 - 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, BlackthornMartClerkScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BlackthornMartCooltrainerMScript, -1 object_event 5, 2, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BlackthornMartBlackBeltScript, -1 |