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/celadonmansion1.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| download | pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/celadonmansion1.asm')
| -rwxr-xr-x | data/mapObjects/celadonmansion1.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index 47fbb0e5..bb38825c 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -2,14 +2,14 @@ CeladonMansion1Object: db $f ; border block db $5 ; warps - db $b, $4, $2, $ff - db $b, $5, $2, $ff - db $0, $4, $4, $ff - db $1, $7, $1, CELADON_MANSION_2 - db $1, $2, $2, CELADON_MANSION_2 + warp $4, $b, $2, $ff + warp $5, $b, $2, $ff + warp $4, $0, $4, $ff + warp $7, $1, $1, CELADON_MANSION_2 + warp $2, $1, $2, CELADON_MANSION_2 db $1 ; signs - db $9, $4, $5 ; CeladonMansion1Text5 + sign $4, $9, $5 ; CeladonMansion1Text5 db $4 ; objects object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person @@ -18,8 +18,8 @@ CeladonMansion1Object: object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person ; warp-to - EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4 - EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $5 - EVENT_DISP CELADON_MANSION_1_WIDTH, $0, $4 - EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $7 ; CELADON_MANSION_2 - EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $2 ; CELADON_MANSION_2 + warp_to $4, $b, CELADON_MANSION_1_WIDTH + warp_to $5, $b, CELADON_MANSION_1_WIDTH + warp_to $4, $0, CELADON_MANSION_1_WIDTH + warp_to $7, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 + warp_to $2, $1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2 |