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/ceruleanhousetrashed.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/ceruleanhousetrashed.asm')
| -rwxr-xr-x | data/mapObjects/ceruleanhousetrashed.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 4f154191..7b90ff73 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -1,19 +1,19 @@ CeruleanHouseTrashedObject: db $a ; border block - db $3 ; warps - db $7, $2, $0, $ff - db $7, $3, $0, $ff - db $0, $3, $7, $ff + db 3 ; warps + warp 2, 7, 0, -1 + warp 3, 7, 0, -1 + warp 3, 0, 7, -1 - db $1 ; signs - db $0, $3, $3 ; CeruleanHouseTrashedText3 + db 1 ; signs + sign 3, 0, 3 ; CeruleanHouseTrashedText3 - db $2 ; objects - object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person - object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person + object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person ; warp-to - EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2 - EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $3 - EVENT_DISP TRASHED_HOUSE_WIDTH, $0, $3 + warp_to 2, 7, TRASHED_HOUSE_WIDTH + warp_to 3, 7, TRASHED_HOUSE_WIDTH + warp_to 3, 0, TRASHED_HOUSE_WIDTH |