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/Route4.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route4.asm')
| -rw-r--r-- | maps/Route4.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route4.asm b/maps/Route4.asm index b39beb7f6..4f86bf502 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const ROUTE4_YOUNGSTER const ROUTE4_LASS1 const ROUTE4_LASS2 const ROUTE4_POKE_BALL Route4_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks TrainerBirdKeeperHank: trainer BIRD_KEEPER, HANK, EVENT_BEAT_BIRD_KEEPER_HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script @@ -121,16 +121,16 @@ MtMoonSquareSignText: Route4_MapEvents: db 0, 0 ; filler - db 1 ; warp events + def_warp_events warp_event 2, 5, MOUNT_MOON, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 7, BGEVENT_READ, MtMoonSquareSign bg_event 10, 3, BGEVENT_ITEM, Route4HiddenUltraBall - db 4 ; object events + def_object_events object_event 17, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 object_event 9, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 object_event 21, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 |