diff options
Diffstat (limited to 'maps/VermilionCity.asm')
| -rw-r--r-- | maps/VermilionCity.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 85dd629c6..781bf2ad1 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -269,33 +269,33 @@ VermilionCity_MapEvents: db 0, 0 ; filler db 10 ; warp events - warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1 - warp_event 9, 5, VERMILION_POKECENTER_1F, 1 - warp_event 7, 13, POKEMON_FAN_CLUB, 1 + warp_event 5, 5, VERMILION_FISHING_SPEECH_HOUSE, 1 + warp_event 9, 5, VERMILION_POKECENTER_1F, 1 + warp_event 7, 13, POKEMON_FAN_CLUB, 1 warp_event 13, 13, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 1 warp_event 21, 13, VERMILION_MART, 2 warp_event 21, 17, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, 1 warp_event 10, 19, VERMILION_GYM, 1 warp_event 19, 31, VERMILION_PORT_PASSAGE, 1 warp_event 20, 31, VERMILION_PORT_PASSAGE, 2 - warp_event 34, 7, DIGLETTS_CAVE, 1 + warp_event 34, 7, DIGLETTS_CAVE, 1 db 0 ; coord events db 8 ; bg events - bg_event 25, 3, BGEVENT_READ, VermilionCitySign - bg_event 5, 19, BGEVENT_READ, VermilionGymSign - bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign - bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign + bg_event 25, 3, BGEVENT_READ, VermilionCitySign + bg_event 5, 19, BGEVENT_READ, VermilionGymSign + bg_event 5, 13, BGEVENT_READ, PokemonFanClubSign + bg_event 33, 9, BGEVENT_READ, VermilionCityDiglettsCaveSign bg_event 27, 15, BGEVENT_READ, VermilionCityPortSign - bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign + bg_event 10, 5, BGEVENT_READ, VermilionCityPokecenterSign bg_event 22, 13, BGEVENT_READ, VermilionCityMartSign bg_event 12, 19, BGEVENT_ITEM, VermilionCityHiddenFullHeal db 6 ; object events - object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 - object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 - object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 + object_event 18, 9, SPRITE_TEACHER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionCityTeacherScript, -1 + object_event 23, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionMachopOwner, -1 + object_event 26, 7, SPRITE_MACHOP, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VermilionMachop, -1 object_event 14, 16, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VermilionCitySuperNerdScript, -1 - object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX + object_event 34, 8, SPRITE_BIG_SNORLAX, SPRITEMOVEDATA_BIGDOLLSYM, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX object_event 31, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionGymBadgeGuy, -1 |