diff options
Diffstat (limited to 'data/maps/objects/SSAnneB1FRooms.asm')
| -rw-r--r-- | data/maps/objects/SSAnneB1FRooms.asm | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 3c7da689..7846186e 100644 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -1,3 +1,16 @@ + object_const_def + const_export SSANNEB1FROOMS_SAILOR1 + const_export SSANNEB1FROOMS_SAILOR2 + const_export SSANNEB1FROOMS_SAILOR3 + const_export SSANNEB1FROOMS_SAILOR4 + const_export SSANNEB1FROOMS_SAILOR5 + const_export SSANNEB1FROOMS_FISHER + const_export SSANNEB1FROOMS_SUPER_NERD + const_export SSANNEB1FROOMS_MACHOKE + const_export SSANNEB1FROOMS_ETHER + const_export SSANNEB1FROOMS_TM_REST + const_export SSANNEB1FROOMS_MAX_POTION + SSAnneB1FRooms_Object: db $c ; border block @@ -16,14 +29,14 @@ SSAnneB1FRooms_Object: def_bg_events def_object_events - object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, 1, OPP_SAILOR, 3 - object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, 2, OPP_SAILOR, 4 - object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, 3, OPP_SAILOR, 5 - object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 6 - object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, 5, OPP_SAILOR, 7 - object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 2 - object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 7 ; person - object_event 11, 12, SPRITE_MONSTER, STAY, NONE, 8 ; person + object_event 0, 13, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR1, OPP_SAILOR, 3 + object_event 2, 11, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR2, OPP_SAILOR, 4 + object_event 12, 3, SPRITE_SAILOR, STAY, LEFT, TEXT_SSANNEB1FROOMS_SAILOR3, OPP_SAILOR, 5 + object_event 22, 2, SPRITE_SAILOR, STAY, DOWN, TEXT_SSANNEB1FROOMS_SAILOR4, OPP_SAILOR, 6 + object_event 0, 2, SPRITE_SAILOR, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SAILOR5, OPP_SAILOR, 7 + object_event 0, 4, SPRITE_FISHER, STAY, RIGHT, TEXT_SSANNEB1FROOMS_FISHER, OPP_FISHER, 2 + object_event 10, 13, SPRITE_SUPER_NERD, STAY, RIGHT, TEXT_SSANNEB1FROOMS_SUPER_NERD + object_event 11, 12, SPRITE_MONSTER, STAY, NONE, TEXT_SSANNEB1FROOMS_MACHOKE object_event 20, 2, SPRITE_POKE_BALL, STAY, NONE, 9, ETHER object_event 10, 2, SPRITE_POKE_BALL, STAY, NONE, 10, TM_REST object_event 12, 11, SPRITE_POKE_BALL, STAY, NONE, 11, MAX_POTION |