diff options
Diffstat (limited to 'data/maps/objects/SSAnne1F.asm')
| -rwxr-xr-x | data/maps/objects/SSAnne1F.asm | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/data/maps/objects/SSAnne1F.asm b/data/maps/objects/SSAnne1F.asm index 600fb50a..56c95a68 100755 --- a/data/maps/objects/SSAnne1F.asm +++ b/data/maps/objects/SSAnne1F.asm @@ -1,7 +1,7 @@ SSAnne1F_Object: db $c ; border block - db 11 ; warps + def_warps warp 26, 0, 1, VERMILION_DOCK warp 27, 0, 1, VERMILION_DOCK warp 31, 8, 0, SS_ANNE_1F_ROOMS @@ -14,21 +14,10 @@ SSAnne1F_Object: warp 37, 15, 5, SS_ANNE_B1F warp 3, 16, 0, SS_ANNE_KITCHEN - db 0 ; signs + def_signs - db 2 ; objects + def_objects object SPRITE_WAITER, 12, 6, WALK, LEFT_RIGHT, 1 ; person object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person - ; warp-to - warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK - warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK - warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS - warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F - warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F - warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN + def_warps_to SS_ANNE_1F |