diff options
Diffstat (limited to 'data/maps/objects/SaffronGym.asm')
| -rw-r--r-- | data/maps/objects/SaffronGym.asm | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index d3606fd8..c8de2d46 100644 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -1,3 +1,14 @@ + object_const_def + const_export SAFFRONGYM_SABRINA + const_export SAFFRONGYM_CHANNELER1 + const_export SAFFRONGYM_YOUNGSTER1 + const_export SAFFRONGYM_CHANNELER2 + const_export SAFFRONGYM_YOUNGSTER2 + const_export SAFFRONGYM_CHANNELER3 + const_export SAFFRONGYM_YOUNGSTER3 + const_export SAFFRONGYM_YOUNGSTER4 + const_export SAFFRONGYM_GYM_GUIDE + SaffronGym_Object: db $2e ; border block @@ -38,14 +49,14 @@ SaffronGym_Object: def_bg_events def_object_events - object_event 9, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_SABRINA, 1 - object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 22 - object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, 4, OPP_CHANNELER, 23 - object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, 6, OPP_CHANNELER, 24 - object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 - object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 9 ; person + object_event 9, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, TEXT_SAFFRONGYM_SABRINA, OPP_SABRINA, 1 + object_event 10, 1, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER1, OPP_CHANNELER, 22 + object_event 17, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER1, OPP_PSYCHIC_TR, 1 + object_event 3, 7, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER2, OPP_CHANNELER, 23 + object_event 17, 7, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER2, OPP_PSYCHIC_TR, 2 + object_event 3, 13, SPRITE_CHANNELER, STAY, DOWN, TEXT_SAFFRONGYM_CHANNELER3, OPP_CHANNELER, 24 + object_event 17, 13, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER3, OPP_PSYCHIC_TR, 3 + object_event 3, 1, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_SAFFRONGYM_YOUNGSTER4, OPP_PSYCHIC_TR, 4 + object_event 10, 15, SPRITE_GYM_GUIDE, STAY, DOWN, TEXT_SAFFRONGYM_GYM_GUIDE def_warps_to SAFFRON_GYM |