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/blueshouse.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/blueshouse.asm')
| -rwxr-xr-x | data/mapObjects/blueshouse.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 231e852d..19338885 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -1,17 +1,17 @@ BluesHouseObject: - db $0A ; border block + db $a ; border block - db $2 ; warps - db $7, $2, $1, $FF - db $7, $3, $1, $FF + db 2 ; warps + warp 2, 7, 1, -1 + warp 3, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map - object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table + db 3 ; objects + object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map + object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table ; warp-to - EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 - EVENT_DISP BLUES_HOUSE_WIDTH, $7, $3 + warp_to 2, 7, BLUES_HOUSE_WIDTH + warp_to 3, 7, BLUES_HOUSE_WIDTH |