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/mansion4.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/mansion4.asm')
| -rwxr-xr-x | data/mapObjects/mansion4.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 94a6f612..3db9d016 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -1,20 +1,20 @@ Mansion4Object: db $1 ; border block - db $1 ; warps - db $16, $17, $5, MANSION_1 + db 1 ; warps + warp 23, 22, 5, MANSION_1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, OPP_BURGLAR, $9 - object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, OPP_SCIENTIST, $d - object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY - object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE - object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 - object SPRITE_BALL, $5, $4, STAY, NONE, $6, TM_22 - object SPRITE_BOOK_MAP_DEX, $10, $14, STAY, NONE, $7 ; person - object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY + db 8 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 + object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 + object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY + object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE + object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14 + object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22 + object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person + object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY ; warp-to - EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1 + warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1 |