summaryrefslogtreecommitdiff
path: root/data/maps/objects/CinnabarLab.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
commite2c99f19103856426966e30cf1910d07995bb936 (patch)
tree513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/CinnabarLab.asm
parent2fe1505babaf02b995cc0d9c3a827b798935b19a (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/CinnabarLab.asm')
-rwxr-xr-xdata/maps/objects/CinnabarLab.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm
index 9398dc1e..1a4f182d 100755
--- a/data/maps/objects/CinnabarLab.asm
+++ b/data/maps/objects/CinnabarLab.asm
@@ -1,20 +1,20 @@
CinnabarLab_Object:
db $17 ; border block
- db 5 ; warps
+ def_warps
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
- db 4 ; signs
+ def_signs
sign 3, 2, 2 ; Lab1Text2
sign 9, 4, 3 ; Lab1Text3
sign 13, 4, 4 ; Lab1Text4
sign 17, 4, 5 ; Lab1Text5
- db 1 ; objects
+ def_objects
object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person
; warp-to