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/GoldenrodBikeShop.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/GoldenrodBikeShop.asm')
| -rw-r--r-- | maps/GoldenrodBikeShop.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 06f2d0e67..14121e027 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const GOLDENRODBIKESHOP_CLERK GoldenrodBikeShop_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks .DummyScene: ; unreferenced end @@ -102,13 +102,13 @@ GoldenrodBikeShopBicycleText: GoldenrodBikeShop_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 2 warp_event 3, 7, GOLDENROD_CITY, 2 - db 0 ; coord events + def_coord_events - db 9 ; bg events + def_bg_events bg_event 1, 2, BGEVENT_READ, GoldenrodBikeShopBicycle bg_event 0, 3, BGEVENT_READ, GoldenrodBikeShopBicycle bg_event 1, 3, BGEVENT_READ, GoldenrodBikeShopBicycle @@ -119,5 +119,5 @@ GoldenrodBikeShop_MapEvents: bg_event 6, 6, BGEVENT_READ, GoldenrodBikeShopBicycle bg_event 7, 6, BGEVENT_READ, GoldenrodBikeShopBicycle - db 1 ; object events + def_object_events object_event 7, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodBikeShopClerkScript, -1 |