summaryrefslogtreecommitdiff
path: root/data/mapObjects/lab4.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/lab4.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/lab4.asm')
-rwxr-xr-xdata/mapObjects/lab4.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm
index 361f9533..2939142a 100755
--- a/data/mapObjects/lab4.asm
+++ b/data/mapObjects/lab4.asm
@@ -2,8 +2,8 @@ Lab4Object:
db $17 ; border block
db $2 ; warps
- db $7, $2, $4, CINNABAR_LAB_1
- db $7, $3, $4, CINNABAR_LAB_1
+ warp $2, $7, $4, CINNABAR_LAB_1
+ warp $3, $7, $4, CINNABAR_LAB_1
db $0 ; signs
@@ -12,5 +12,5 @@ Lab4Object:
object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person
; warp-to
- EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1
- EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1
+ warp_to $2, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1
+ warp_to $3, $7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1