diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
| commit | d271d6917549074e721f3e5064b77e1ad1dbe44a (patch) | |
| tree | cee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/celadonmart4.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/celadonmart4.asm')
| -rwxr-xr-x | data/mapObjects/celadonmart4.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 386dba8c..b7e3e68f 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -2,12 +2,12 @@ CeladonMart4Object: db $f ; border block db $3 ; warps - db $1, $c, $0, CELADON_MART_3 - db $1, $10, $1, CELADON_MART_5 - db $1, $1, $0, CELADON_MART_ELEVATOR + warp $c, $1, $0, CELADON_MART_3 + warp $10, $1, $1, CELADON_MART_5 + warp $1, $1, $0, CELADON_MART_ELEVATOR db $1 ; signs - db $1, $e, $4 ; CeladonMart4Text4 + sign $e, $1, $4 ; CeladonMart4Text4 db $3 ; objects object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person @@ -15,6 +15,6 @@ CeladonMart4Object: object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person ; warp-to - EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3 - EVENT_DISP CELADON_MART_4_WIDTH, $1, $10 ; CELADON_MART_5 - EVENT_DISP CELADON_MART_4_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to $c, $1, CELADON_MART_4_WIDTH ; CELADON_MART_3 + warp_to $10, $1, CELADON_MART_4_WIDTH ; CELADON_MART_5 + warp_to $1, $1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR |