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/ssanne6.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/ssanne6.asm')
| -rwxr-xr-x | data/mapObjects/ssanne6.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 8c2444f8..a25fe9b3 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -1,19 +1,19 @@ SSAnne6Object: db $c ; border block - db $1 ; warps - db $0, $6, $a, SS_ANNE_1 + db 1 ; warps + warp 6, 0, 10, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $7 ; objects - object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person - object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person - object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person - object SPRITE_COOK, $d, $6, STAY, NONE, $4 ; person - object SPRITE_COOK, $d, $8, STAY, NONE, $5 ; person - object SPRITE_COOK, $d, $a, STAY, NONE, $6 ; person - object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person + db 7 ; objects + object SPRITE_COOK, 1, 8, WALK, 1, 1 ; person + object SPRITE_COOK, 5, 8, WALK, 1, 2 ; person + object SPRITE_COOK, 9, 7, WALK, 1, 3 ; person + object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person + object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person + object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person + object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person ; warp-to - EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 + warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1 |