diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/SaffronGym.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/SaffronGym.asm')
| -rw-r--r-- | maps/SaffronGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index b5af54c6..32f50104 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const SAFFRONGYM_SABRINA const SAFFRONGYM_GRANNY1 const SAFFRONGYM_YOUNGSTER1 @@ -7,9 +7,9 @@ const SAFFRONGYM_GYM_GUIDE SaffronGym_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks SaffronGymSabrinaScript: faceplayer @@ -291,7 +291,7 @@ SaffronGymGuideWinText: SaffronGym_MapEvents: db 0, 0 ; filler - db 32 ; warp events + def_warp_events warp_event 8, 17, SAFFRON_CITY, 2 warp_event 9, 17, SAFFRON_CITY, 2 warp_event 11, 15, SAFFRON_GYM, 18 @@ -325,12 +325,12 @@ SaffronGym_MapEvents: warp_event 1, 3, SAFFRON_GYM, 16 warp_event 11, 9, SAFFRON_GYM, 17 - db 0 ; coord events + def_coord_events - db 1 ; bg events + def_bg_events bg_event 8, 15, BGEVENT_READ, SaffronGymStatue - db 6 ; object events + def_object_events object_event 9, 8, SPRITE_SABRINA, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SaffronGymSabrinaScript, -1 object_event 17, 16, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 |