diff options
Diffstat (limited to 'data/maps/objects/SSAnne2FRooms.asm')
| -rwxr-xr-x | data/maps/objects/SSAnne2FRooms.asm | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 454b4c6b..b63d10e6 100755 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,7 +1,7 @@ SSAnne2FRooms_Object: db $c ; border block - db 12 ; warps + def_warps warp 2, 5, 0, SS_ANNE_2F warp 3, 5, 0, SS_ANNE_2F warp 12, 5, 1, SS_ANNE_2F @@ -15,9 +15,9 @@ SSAnne2FRooms_Object: warp 22, 15, 5, SS_ANNE_2F warp 23, 15, 5, SS_ANNE_2F - db 0 ; signs + def_signs - db 13 ; objects + def_objects object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 @@ -32,16 +32,4 @@ SSAnne2FRooms_Object: object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person - ; warp-to - warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F - warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F + def_warps_to SS_ANNE_2F_ROOMS |