diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 10:57:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 10:57:14 -0600 |
| commit | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch) | |
| tree | 3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/lab3.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
| parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff) | |
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/lab3.asm')
| -rwxr-xr-x | data/mapObjects/lab3.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index c5ee01c3..73ba321d 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -1,19 +1,19 @@ Lab3Object: db $17 ; border block - db $2 ; warps - db $7, $2, $3, CINNABAR_LAB_1 - db $7, $3, $3, CINNABAR_LAB_1 + db 2 ; warps + 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 + db 3 ; signs + 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 + 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 |