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/ceruleanmart.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/ceruleanmart.asm')
| -rwxr-xr-x | data/mapObjects/ceruleanmart.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index 301d11a2..389e0317 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -1,17 +1,17 @@ CeruleanMartObject: db $0 ; border block - db $2 ; warps - db $7, $3, $5, $ff - db $7, $4, $5, $ff + db 2 ; warps + warp 3, 7, 5, -1 + warp 4, 7, 5, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $3, $4, WALK, $1, $2 ; person - object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person + object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person ; warp-to - EVENT_DISP CERULEAN_MART_WIDTH, $7, $3 - EVENT_DISP CERULEAN_MART_WIDTH, $7, $4 + warp_to 3, 7, CERULEAN_MART_WIDTH + warp_to 4, 7, CERULEAN_MART_WIDTH |