diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-03-27 14:11:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 14:11:59 -0500 |
| commit | e2e8bf6a8477af254ea7057028f72ac918b62005 (patch) | |
| tree | ffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/celadonmart2.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| parent | Removed EVENT_DISP (diff) | |
| download | pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/celadonmart2.asm')
| -rwxr-xr-x | data/mapObjects/celadonmart2.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index a6c9af59..db095add 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,21 +1,21 @@ CeladonMart2Object: db $f ; border block - db $3 ; warps - db $1, $c, $4, CELADON_MART_1 - db $1, $10, $1, CELADON_MART_3 - db $1, $1, $0, CELADON_MART_ELEVATOR + db 3 ; warps + warp 12, 1, 4, CELADON_MART_1 + warp 16, 1, 1, CELADON_MART_3 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $1 ; signs - db $1, $e, $5 ; CeladonMart2Text5 + db 1 ; signs + sign 14, 1, 5 ; CeladonMart2Text5 - db $4 ; objects - object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person - object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person - object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person - object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person + db 4 ; objects + object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person + object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person ; warp-to - EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1 - EVENT_DISP CELADON_MART_2_WIDTH, $1, $10 ; CELADON_MART_3 - EVENT_DISP CELADON_MART_2_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1F + warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3F + warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR |