diff options
Diffstat (limited to 'data/maps/objects/VermilionCity.asm')
| -rw-r--r-- | data/maps/objects/VermilionCity.asm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 1b989ad7..c30d43ba 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -1,32 +1,32 @@ VermilionCity_Object: db $43 ; border block - def_warps - warp 11, 3, 0, VERMILION_POKECENTER - warp 9, 13, 0, POKEMON_FAN_CLUB - warp 23, 13, 0, VERMILION_MART - warp 12, 19, 0, VERMILION_GYM - warp 23, 19, 0, VERMILION_PIDGEY_HOUSE - warp 18, 31, 0, VERMILION_DOCK - warp 19, 31, 0, VERMILION_DOCK - warp 15, 13, 0, VERMILION_TRADE_HOUSE - warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE + def_warp_events + warp_event 11, 3, VERMILION_POKECENTER, 0 + warp_event 9, 13, POKEMON_FAN_CLUB, 0 + warp_event 23, 13, VERMILION_MART, 0 + warp_event 12, 19, VERMILION_GYM, 0 + warp_event 23, 19, VERMILION_PIDGEY_HOUSE, 0 + warp_event 18, 31, VERMILION_DOCK, 0 + warp_event 19, 31, VERMILION_DOCK, 0 + warp_event 15, 13, VERMILION_TRADE_HOUSE, 0 + warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 0 - def_signs - sign 27, 3, 7 ; VermilionCityText7 - sign 37, 13, 8 ; VermilionCityText8 - sign 24, 13, 9 ; MartSignText - sign 12, 3, 10 ; PokeCenterSignText - sign 7, 13, 11 ; VermilionCityText11 - sign 7, 19, 12 ; VermilionCityText12 - sign 29, 15, 13 ; VermilionCityText13 + def_bg_events + bg_event 27, 3, 7 ; VermilionCityText7 + bg_event 37, 13, 8 ; VermilionCityText8 + bg_event 24, 13, 9 ; MartSignText + bg_event 12, 3, 10 ; PokeCenterSignText + bg_event 7, 13, 11 ; VermilionCityText11 + bg_event 7, 19, 12 ; VermilionCityText12 + bg_event 29, 15, 13 ; VermilionCityText13 - def_objects - object SPRITE_BEAUTY, 19, 7, WALK, LEFT_RIGHT, 1 ; person - object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person - object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person - object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person - object SPRITE_MONSTER, 29, 9, WALK, UP_DOWN, 5 ; person - object SPRITE_SAILOR, 25, 27, WALK, LEFT_RIGHT, 6 ; person + def_object_events + object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person + object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person + object_event 19, 30, SPRITE_SAILOR, STAY, UP, 3 ; person + object_event 30, 7, SPRITE_GAMBLER, STAY, NONE, 4 ; person + object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person + object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person def_warps_to VERMILION_CITY |