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/CherrygroveMart.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/CherrygroveMart.asm')
| -rw-r--r-- | maps/CherrygroveMart.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 601ff7534..3f0d3b199 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CHERRYGROVEMART_CLERK const CHERRYGROVEMART_COOLTRAINER_M const CHERRYGROVEMART_YOUNGSTER CherrygroveMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CherrygroveMartClerkScript: opentext @@ -72,15 +72,15 @@ CherrygroveMartYoungsterText: CherrygroveMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CHERRYGROVE_CITY, 1 warp_event 3, 7, CHERRYGROVE_CITY, 1 - 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, CherrygroveMartClerkScript, -1 object_event 7, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveMartCooltrainerMScript, -1 object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveMartYoungsterScript, -1 |