diff options
Diffstat (limited to 'data/maps/objects/CeladonMart1F.asm')
| -rwxr-xr-x | data/maps/objects/CeladonMart1F.asm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 6f4762fa..055f48b9 100755 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -1,7 +1,7 @@ CeladonMart1F_Object: db $f ; border block - db 6 ; warps + def_warps warp 2, 7, 0, LAST_MAP warp 3, 7, 0, LAST_MAP warp 16, 7, 1, LAST_MAP @@ -9,17 +9,11 @@ CeladonMart1F_Object: warp 12, 1, 0, CELADON_MART_2F warp 1, 1, 0, CELADON_MART_ELEVATOR - db 2 ; signs + def_signs sign 11, 4, 2 ; CeladonMart1Text2 sign 14, 1, 3 ; CeladonMart1Text3 - db 1 ; objects + def_objects object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person - ; warp-to - warp_to 2, 7, CELADON_MART_1F_WIDTH - warp_to 3, 7, CELADON_MART_1F_WIDTH - warp_to 16, 7, CELADON_MART_1F_WIDTH - warp_to 17, 7, CELADON_MART_1F_WIDTH - warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F - warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR + def_warps_to CELADON_MART_1F |