diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-26 16:31:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 16:31:02 -0400 |
| commit | 553cb9bc82e751da5fa940d797aaf474d998f8a4 (patch) | |
| tree | c3a35971e9c5bbd274d61728f2cf4882eb65e40c /maps/VioletMart.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
| parent | 35821ec58c244be1f5cb670e07873e8a875c10a5 (diff) | |
Merge pull request #754 from Rangi42/master
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/VioletMart.asm')
| -rw-r--r-- | maps/VioletMart.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index ff3898753..575d19b91 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const VIOLETMART_CLERK const VIOLETMART_GRANNY const VIOLETMART_COOLTRAINER_M VioletMart_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks VioletMartClerkScript: opentext @@ -49,15 +49,15 @@ VioletMartCooltrainerMText: VioletMart_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, VIOLET_CITY, 1 warp_event 3, 7, VIOLET_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, VioletMartClerkScript, -1 object_event 7, 6, SPRITE_GRANNY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletMartGrannyScript, -1 object_event 5, 2, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletMartCooltrainerMScript, -1 |