diff options
Diffstat (limited to 'data/maps/objects/SaffronCity.asm')
| -rw-r--r-- | data/maps/objects/SaffronCity.asm | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index f69b3333..c09a44de 100644 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -1,43 +1,43 @@ SaffronCity_Object: db $f ; border block - def_warps - warp 7, 5, 0, COPYCATS_HOUSE_1F - warp 26, 3, 0, FIGHTING_DOJO - warp 34, 3, 0, SAFFRON_GYM - warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE - warp 25, 11, 0, SAFFRON_MART - warp 18, 21, 0, SILPH_CO_1F - warp 9, 29, 0, SAFFRON_POKECENTER - warp 29, 29, 0, MR_PSYCHICS_HOUSE + def_warp_events + warp_event 7, 5, COPYCATS_HOUSE_1F, 0 + warp_event 26, 3, FIGHTING_DOJO, 0 + warp_event 34, 3, SAFFRON_GYM, 0 + warp_event 13, 11, SAFFRON_PIDGEY_HOUSE, 0 + warp_event 25, 11, SAFFRON_MART, 0 + warp_event 18, 21, SILPH_CO_1F, 0 + warp_event 9, 29, SAFFRON_POKECENTER, 0 + warp_event 29, 29, MR_PSYCHICS_HOUSE, 0 - def_signs - sign 17, 5, 16 ; SaffronCityText16 - sign 27, 5, 17 ; SaffronCityText17 - sign 35, 5, 18 ; SaffronCityText18 - sign 26, 11, 19 ; MartSignText - sign 39, 19, 20 ; SaffronCityText20 - sign 5, 21, 21 ; SaffronCityText21 - sign 15, 21, 22 ; SaffronCityText22 - sign 10, 29, 23 ; PokeCenterSignText - sign 27, 29, 24 ; SaffronCityText24 - sign 1, 19, 25 ; SaffronCityText25 + def_bg_events + bg_event 17, 5, 16 ; SaffronCityText16 + bg_event 27, 5, 17 ; SaffronCityText17 + bg_event 35, 5, 18 ; SaffronCityText18 + bg_event 26, 11, 19 ; MartSignText + bg_event 39, 19, 20 ; SaffronCityText20 + bg_event 5, 21, 21 ; SaffronCityText21 + bg_event 15, 21, 22 ; SaffronCityText22 + bg_event 10, 29, 23 ; PokeCenterSignText + bg_event 27, 29, 24 ; SaffronCityText24 + bg_event 1, 19, 25 ; SaffronCityText25 - def_objects - object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person - object SPRITE_ROCKET, 20, 8, WALK, LEFT_RIGHT, 2 ; person - object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person - object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person - object SPRITE_ROCKET, 11, 25, WALK, LEFT_RIGHT, 5 ; person - object SPRITE_ROCKET, 32, 13, WALK, LEFT_RIGHT, 6 ; person - object SPRITE_ROCKET, 18, 30, WALK, LEFT_RIGHT, 7 ; person - object SPRITE_SCIENTIST, 8, 14, WALK, ANY_DIR, 8 ; person - object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person - object SPRITE_ERIKA, 17, 30, WALK, LEFT_RIGHT, 10 ; person - object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person - object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person - object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person - object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person - object SPRITE_ROCKET, 19, 22, STAY, DOWN, 15 ; person + def_object_events + object_event 7, 6, SPRITE_ROCKET, STAY, NONE, 1 ; person + object_event 20, 8, SPRITE_ROCKET, WALK, LEFT_RIGHT, 2 ; person + object_event 34, 4, SPRITE_ROCKET, STAY, NONE, 3 ; person + object_event 13, 12, SPRITE_ROCKET, STAY, NONE, 4 ; person + object_event 11, 25, SPRITE_ROCKET, WALK, LEFT_RIGHT, 5 ; person + object_event 32, 13, SPRITE_ROCKET, WALK, LEFT_RIGHT, 6 ; person + object_event 18, 30, SPRITE_ROCKET, WALK, LEFT_RIGHT, 7 ; person + object_event 8, 14, SPRITE_SCIENTIST, WALK, ANY_DIR, 8 ; person + object_event 23, 23, SPRITE_SILPH_WORKER, STAY, NONE, 9 ; person + object_event 17, 30, SPRITE_ERIKA, WALK, LEFT_RIGHT, 10 ; person + object_event 30, 12, SPRITE_GENTLEMAN, STAY, DOWN, 11 ; person + object_event 31, 12, SPRITE_BIRD, STAY, DOWN, 12 ; person + object_event 18, 8, SPRITE_ROCKER, STAY, UP, 13 ; person + object_event 18, 22, SPRITE_ROCKET, STAY, DOWN, 14 ; person + object_event 19, 22, SPRITE_ROCKET, STAY, DOWN, 15 ; person def_warps_to SAFFRON_CITY |