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/Route20.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route20.asm')
| -rw-r--r-- | maps/Route20.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm index d04bc01cf..2b22c2bee 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,12 +1,12 @@ - object_const_def ; object_event constants + object_const_def const ROUTE20_SWIMMER_GIRL1 const ROUTE20_SWIMMER_GIRL2 const ROUTE20_SWIMMER_GUY Route20_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: @@ -113,15 +113,15 @@ CinnabarGymSignText: Route20_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 38, 7, SEAFOAM_GYM, 1 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 37, 11, BGEVENT_READ, CinnabarGymSign - db 3 ; object events + def_object_events object_event 52, 8, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfNicole, -1 object_event 45, 13, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfLori, -1 object_event 12, 13, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermCameron, -1 |