summaryrefslogtreecommitdiff
path: root/maps/TinTower7F.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/TinTower7F.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/TinTower7F.asm')
-rw-r--r--maps/TinTower7F.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm
index 04ea5c50..2ff0da50 100644
--- a/maps/TinTower7F.asm
+++ b/maps/TinTower7F.asm
@@ -1,10 +1,10 @@
- object_const_def ; object_event constants
+ object_const_def
const TINTOWER7F_POKE_BALL
TinTower7F_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
TinTower7FMaxRevive:
itemball MAX_REVIVE
@@ -12,16 +12,16 @@ TinTower7FMaxRevive:
TinTower7F_MapEvents:
db 0, 0 ; filler
- db 5 ; warp events
+ def_warp_events
warp_event 3, 9, TIN_TOWER_6F, 1
warp_event 10, 15, TIN_TOWER_8F, 1
warp_event 12, 7, TIN_TOWER_7F, 4
warp_event 8, 3, TIN_TOWER_7F, 3
warp_event 6, 9, TIN_TOWER_9F, 5
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 1 ; object events
+ def_object_events
object_event 16, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TinTower7FMaxRevive, EVENT_TIN_TOWER_7F_MAX_REVIVE