summaryrefslogtreecommitdiff
path: root/maps/TimeCapsule.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-26 16:29:43 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-26 16:29:43 -0400
commitd24f1c71149b59c50dba57e500f30b223a54a25f (patch)
tree140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/TimeCapsule.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/TimeCapsule.asm')
-rw-r--r--maps/TimeCapsule.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index ca6c897e..be95db85 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