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/saffronhouse1.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/saffronhouse1.asm')
| -rwxr-xr-x | data/mapObjects/saffronhouse1.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 9f6d7750..c6abb539 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -1,18 +1,18 @@ SaffronHouse1Object: db $a ; border block - db $2 ; warps - db $7, $2, $3, $ff - db $7, $3, $3, $ff + db 2 ; warps + warp 2, 7, 3, -1 + warp 3, 7, 3, -1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person - object SPRITE_BIRD, $0, $4, WALK, $1, $2 ; person - object SPRITE_BUG_CATCHER, $4, $1, STAY, DOWN, $3 ; person - object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person + db 4 ; objects + object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person + object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person + object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person ; warp-to - EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2 - EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $3 + warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH + warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH |