diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
| commit | d271d6917549074e721f3e5064b77e1ad1dbe44a (patch) | |
| tree | cee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/lab1.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/lab1.asm')
| -rwxr-xr-x | data/mapObjects/lab1.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index e0adaedc..d801b948 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -2,24 +2,24 @@ Lab1Object: db $17 ; border block db $5 ; warps - db $7, $2, $2, $ff - db $7, $3, $2, $ff - db $4, $8, $0, CINNABAR_LAB_2 - db $4, $c, $0, CINNABAR_LAB_3 - db $4, $10, $0, CINNABAR_LAB_4 + warp $2, $7, $2, $ff + warp $3, $7, $2, $ff + warp $8, $4, $0, CINNABAR_LAB_2 + warp $c, $4, $0, CINNABAR_LAB_3 + warp $10, $4, $0, CINNABAR_LAB_4 db $4 ; signs - db $2, $3, $2 ; Lab1Text2 - db $4, $9, $3 ; Lab1Text3 - db $4, $d, $4 ; Lab1Text4 - db $4, $11, $5 ; Lab1Text5 + sign $3, $2, $2 ; Lab1Text2 + sign $9, $4, $3 ; Lab1Text3 + sign $d, $4, $4 ; Lab1Text4 + sign $11, $4, $5 ; Lab1Text5 db $1 ; objects object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $3 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $8 ; CINNABAR_LAB_2 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $c ; CINNABAR_LAB_3 - EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $10 ; CINNABAR_LAB_4 + warp_to $2, $7, CINNABAR_LAB_1_WIDTH + warp_to $3, $7, CINNABAR_LAB_1_WIDTH + warp_to $8, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2 + warp_to $c, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3 + warp_to $10, $4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4 |