diff options
Diffstat (limited to 'maps/CianwoodCity.asm')
| -rw-r--r-- | maps/CianwoodCity.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 4b5c9a380..4e1d1d4d5 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -383,36 +383,36 @@ CianwoodCity_MapEvents: db 7 ; warp events warp_event 17, 41, MANIAS_HOUSE, 1 - warp_event 8, 43, CIANWOOD_GYM, 1 + warp_event 8, 43, CIANWOOD_GYM, 1 warp_event 23, 43, CIANWOOD_POKECENTER_1F, 1 warp_event 15, 47, CIANWOOD_PHARMACY, 1 - warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1 + warp_event 9, 31, CIANWOOD_PHOTO_STUDIO, 1 warp_event 15, 37, CIANWOOD_LUGIA_SPEECH_HOUSE, 1 - warp_event 5, 17, POKE_SEERS_HOUSE, 1 + warp_event 5, 17, POKE_SEERS_HOUSE, 1 db 1 ; coord events coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine db 8 ; bg events bg_event 20, 34, BGEVENT_READ, CianwoodCitySign - bg_event 7, 45, BGEVENT_READ, CianwoodGymSign + bg_event 7, 45, BGEVENT_READ, CianwoodGymSign bg_event 24, 43, BGEVENT_READ, CianwoodPokecenterSign bg_event 19, 47, BGEVENT_READ, CianwoodPharmacySign - bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign - bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign - bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive - bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther + bg_event 8, 32, BGEVENT_READ, CianwoodPhotoStudioSign + bg_event 8, 24, BGEVENT_READ, CianwoodPokeSeerSign + bg_event 4, 19, BGEVENT_ITEM, CianwoodCityHiddenRevive + bg_event 5, 29, BGEVENT_ITEM, CianwoodCityHiddenMaxEther db 12 ; object events object_event 21, 37, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodCityYoungster, -1 object_event 17, 33, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityPokefanM, -1 object_event 14, 42, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityLass, -1 - object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 8, 16, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 9, 17, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 4, 25, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 5, 29, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 object_event 10, 27, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 - object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 + object_event 4, 19, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityRock, -1 object_event 10, 46, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodCityChucksWife, -1 object_event 11, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE object_event 10, 14, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY |