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/mansion2.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/mansion2.asm')
| -rwxr-xr-x | data/mapObjects/mansion2.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index bda2ad27..cea8c8fc 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -1,22 +1,22 @@ Mansion2Object: db $1 ; border block - db $4 ; warps - db $a, $5, $4, MANSION_1 - db $a, $7, $0, MANSION_3 - db $e, $19, $2, MANSION_3 - db $1, $6, $1, MANSION_3 + db 4 ; warps + warp 5, 10, 4, MANSION_1 + warp 7, 10, 0, MANSION_3 + warp 25, 14, 2, MANSION_3 + warp 6, 1, 1, MANSION_3 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, OPP_BURGLAR, $7 - object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM - object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person - object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person + db 4 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 + object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person ; warp-to - EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1 - EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3 - EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3 - EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3 + warp_to 5, 10, MANSION_2_WIDTH ; MANSION_1 + warp_to 7, 10, MANSION_2_WIDTH ; MANSION_3 + warp_to 25, 14, MANSION_2_WIDTH ; MANSION_3 + warp_to 6, 1, MANSION_2_WIDTH ; MANSION_3 |