summaryrefslogtreecommitdiff
path: root/data/mapObjects/lab3.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/lab3.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/lab3.asm')
-rwxr-xr-xdata/mapObjects/lab3.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm
index c5ee01c3..ebea056c 100755
--- a/data/mapObjects/lab3.asm
+++ b/data/mapObjects/lab3.asm
@@ -2,18 +2,18 @@ Lab3Object:
db $17 ; border block
db $2 ; warps
- db $7, $2, $3, CINNABAR_LAB_1
- db $7, $3, $3, CINNABAR_LAB_1
+ warp $2, $7, $3, CINNABAR_LAB_1
+ warp $3, $7, $3, CINNABAR_LAB_1
db $3 ; signs
- db $4, $0, $3 ; Lab3Text3
- db $4, $1, $4 ; Lab3Text4
- db $1, $2, $5 ; Lab3Text5
+ sign $0, $4, $3 ; Lab3Text3
+ sign $1, $4, $4 ; Lab3Text4
+ sign $2, $1, $5 ; Lab3Text5
db $2 ; objects
object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person
object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person
; warp-to
- EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1
- EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $3 ; CINNABAR_LAB_1
+ warp_to $2, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1
+ warp_to $3, $7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1