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/CeruleanMart.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/CeruleanMart.asm')
| -rw-r--r-- | maps/CeruleanMart.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 7d55c48b9..62dfe9f36 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const CERULEANMART_CLERK const CERULEANMART_COOLTRAINER_M const CERULEANMART_COOLTRAINER_F CeruleanMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanMart_Clerk: opentext @@ -46,15 +46,15 @@ CeruleanMart_CooltrainerFText: CeruleanMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CERULEAN_CITY, 6 warp_event 3, 7, CERULEAN_CITY, 6 - 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, CeruleanMart_Clerk, -1 object_event 1, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerM, -1 object_event 7, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeruleanMart_CooltrainerF, -1 |