diff options
Diffstat (limited to 'data/maps/objects/SSAnne2FRooms.asm')
| -rw-r--r-- | data/maps/objects/SSAnne2FRooms.asm | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index 78a2dd38..21948e65 100644 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -1,35 +1,35 @@ SSAnne2FRooms_Object: db $c ; border block - def_warps - warp 2, 5, 0, SS_ANNE_2F - warp 3, 5, 0, SS_ANNE_2F - warp 12, 5, 1, SS_ANNE_2F - warp 13, 5, 1, SS_ANNE_2F - warp 22, 5, 2, SS_ANNE_2F - warp 23, 5, 2, SS_ANNE_2F - warp 2, 15, 3, SS_ANNE_2F - warp 3, 15, 3, SS_ANNE_2F - warp 12, 15, 4, SS_ANNE_2F - warp 13, 15, 4, SS_ANNE_2F - warp 22, 15, 5, SS_ANNE_2F - warp 23, 15, 5, SS_ANNE_2F + def_warp_events + warp_event 2, 5, SS_ANNE_2F, 0 + warp_event 3, 5, SS_ANNE_2F, 0 + warp_event 12, 5, SS_ANNE_2F, 1 + warp_event 13, 5, SS_ANNE_2F, 1 + warp_event 22, 5, SS_ANNE_2F, 2 + warp_event 23, 5, SS_ANNE_2F, 2 + warp_event 2, 15, SS_ANNE_2F, 3 + warp_event 3, 15, SS_ANNE_2F, 3 + warp_event 12, 15, SS_ANNE_2F, 4 + warp_event 13, 15, SS_ANNE_2F, 4 + warp_event 22, 15, SS_ANNE_2F, 5 + warp_event 23, 15, SS_ANNE_2F, 5 - def_signs + def_bg_events - 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 - object SPRITE_COOLTRAINER_F, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 - object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER - object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_GRAMPS, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_POKE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY - object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_LITTLE_BOY, 11, 14, STAY, NONE, 11 ; person - object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person + def_object_events + object_event 10, 2, SPRITE_GENTLEMAN, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 + object_event 13, 4, SPRITE_FISHER, STAY, LEFT, 2, OPP_FISHER, 1 + object_event 0, 14, SPRITE_GENTLEMAN, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 + object_event 2, 11, SPRITE_COOLTRAINER_F, STAY, DOWN, 4, OPP_LASS, 12 + object_event 1, 2, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person + object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 6, MAX_ETHER + object_event 21, 2, SPRITE_GENTLEMAN, STAY, DOWN, 7 ; person + object_event 22, 1, SPRITE_GRAMPS, STAY, DOWN, 8 ; person + object_event 0, 12, SPRITE_POKE_BALL, STAY, NONE, 9, RARE_CANDY + object_event 12, 12, SPRITE_GENTLEMAN, STAY, DOWN, 10 ; person + object_event 11, 14, SPRITE_LITTLE_BOY, STAY, NONE, 11 ; person + object_event 22, 12, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 12 ; person + object_event 20, 12, SPRITE_BEAUTY, STAY, RIGHT, 13 ; person def_warps_to SS_ANNE_2F_ROOMS |