diff options
Diffstat (limited to 'data/maps/objects/SSAnne2F.asm')
| -rwxr-xr-x | data/maps/objects/SSAnne2F.asm | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index 97dbbcc1..a506570a 100755 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -1,7 +1,7 @@ SSAnne2F_Object: db $c ; border block - db 9 ; warps + def_warps warp 9, 11, 0, SS_ANNE_2F_ROOMS warp 13, 11, 2, SS_ANNE_2F_ROOMS warp 17, 11, 4, SS_ANNE_2F_ROOMS @@ -12,19 +12,10 @@ SSAnne2F_Object: warp 2, 12, 1, SS_ANNE_3F warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM - db 0 ; signs + def_signs - db 2 ; objects + def_objects object SPRITE_WAITER, 3, 7, WALK, UP_DOWN, 1 ; person object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1 - ; warp-to - warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS - warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F - warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F - warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM + def_warps_to SS_ANNE_2F |