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/RadioTower1F.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/RadioTower1F.asm')
| -rw-r--r-- | maps/RadioTower1F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 376b70c1..da25d756 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const RADIOTOWER1F_RECEPTIONIST const RADIOTOWER1F_LASS const RADIOTOWER1F_YOUNGSTER @@ -7,9 +7,9 @@ const RADIOTOWER1F_CARD_WOMAN RadioTower1F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks RadioTower1FReceptionistScript: faceplayer @@ -469,18 +469,18 @@ RadioTower1FLuckyChannelSignText: RadioTower1F_MapEvents: db 0, 0 ; filler - db 3 ; warp events + def_warp_events warp_event 2, 7, GOLDENROD_CITY, 12 warp_event 3, 7, GOLDENROD_CITY, 12 warp_event 15, 0, RADIO_TOWER_2F, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 3, 0, BGEVENT_READ, RadioTower1FDirectory bg_event 13, 0, BGEVENT_READ, RadioTower1FLuckyChannelSign - db 6 ; object events + def_object_events object_event 5, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FReceptionistScript, -1 object_event 16, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower1FLassScript, EVENT_GOLDENROD_CITY_CIVILIANS object_event 15, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower1FYoungsterScript, EVENT_GOLDENROD_CITY_CIVILIANS |