diff options
| author | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
|---|---|---|
| committer | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
| commit | 3d8e949d373a828fee370b08d005f131abb67333 (patch) | |
| tree | e200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/celadonmartroof.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| download | pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip | |
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/celadonmartroof.asm')
| -rwxr-xr-x | data/mapObjects/celadonmartroof.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 63a1b4d7..744a636d 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -1,18 +1,18 @@ CeladonMartRoofObject: db $42 ; border block - db $1 ; warps - db $2, $f, $0, CELADON_MART_5 + db 1 ; warps + warp 15, 2, 0, CELADON_MART_5 - db $4 ; signs - db $1, $a, $3 ; CeladonMartRoofText3 - db $1, $b, $4 ; CeladonMartRoofText4 - db $2, $c, $5 ; CeladonMartRoofText5 - db $2, $d, $6 ; CeladonMartRoofText6 + db 4 ; signs + sign 10, 1, 3 ; CeladonMartRoofText3 + sign 11, 1, 4 ; CeladonMartRoofText4 + sign 12, 2, 5 ; CeladonMartRoofText5 + sign 13, 2, 6 ; CeladonMartRoofText6 - db $2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person - object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person + db 2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person ; warp-to - EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5 + warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F |