diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-26 16:31:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 16:31:02 -0400 |
| commit | 553cb9bc82e751da5fa940d797aaf474d998f8a4 (patch) | |
| tree | c3a35971e9c5bbd274d61728f2cf4882eb65e40c /maps/TimeCapsule.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
| parent | 35821ec58c244be1f5cb670e07873e8a875c10a5 (diff) | |
Merge pull request #754 from Rangi42/master
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/TimeCapsule.asm')
| -rw-r--r-- | maps/TimeCapsule.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index ca6c897ef..be95db858 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const TIMECAPSULE_CHRIS1 const TIMECAPSULE_CHRIS2 TimeCapsule_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .InitializeTimeCapsule ; SCENE_DEFAULT scene_script .DummyScene ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTimeCapsule: @@ -54,16 +54,16 @@ TimeCapsuleFriendScript: TimeCapsule_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 7, POKECENTER_2F, 4 warp_event 5, 7, POKECENTER_2F, 4 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 4, BGEVENT_RIGHT, TimeCapsuleConsoleScript bg_event 5, 4, BGEVENT_LEFT, TimeCapsuleConsoleScript - db 2 ; object events + def_object_events object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TimeCapsuleFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 |