diff options
Diffstat (limited to 'maps/VioletCity.asm')
| -rw-r--r-- | maps/VioletCity.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index e6ff519a4..34939ff3e 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -284,36 +284,36 @@ VioletCity_MapEventHeader: .Warps: db 9 - warp_def $11, $9, 2, VIOLET_MART - warp_def $11, $12, 1, VIOLET_GYM - warp_def $11, $1e, 1, EARLS_POKEMON_ACADEMY - warp_def $f, $3, 1, VIOLET_NICKNAME_SPEECH_HOUSE - warp_def $19, $1f, 1, VIOLET_POKECENTER_1F - warp_def $1d, $15, 1, VIOLET_KYLES_HOUSE - warp_def $5, $17, 1, SPROUT_TOWER_1F - warp_def $18, $27, 1, ROUTE_31_VIOLET_GATE - warp_def $19, $27, 2, ROUTE_31_VIOLET_GATE + warp_def 9, 17, 2, VIOLET_MART + warp_def 18, 17, 1, VIOLET_GYM + warp_def 30, 17, 1, EARLS_POKEMON_ACADEMY + warp_def 3, 15, 1, VIOLET_NICKNAME_SPEECH_HOUSE + warp_def 31, 25, 1, VIOLET_POKECENTER_1F + warp_def 21, 29, 1, VIOLET_KYLES_HOUSE + warp_def 23, 5, 1, SPROUT_TOWER_1F + warp_def 39, 24, 1, ROUTE_31_VIOLET_GATE + warp_def 39, 25, 2, ROUTE_31_VIOLET_GATE .CoordEvents: db 0 .BGEvents: db 7 - bg_event 20, 24, BGEVENT_READ, VioletCitySign - bg_event 17, 15, BGEVENT_READ, VioletGymSign - bg_event 8, 24, BGEVENT_READ, SproutTowerSign - bg_event 17, 27, BGEVENT_READ, EarlsPokemonAcademySign - bg_event 25, 32, BGEVENT_READ, VioletCityPokecenterSign - bg_event 17, 10, BGEVENT_READ, VioletCityMartSign - bg_event 14, 37, BGEVENT_ITEM, VioletCityHiddenHyperPotion + bg_event 24, 20, BGEVENT_READ, VioletCitySign + bg_event 15, 17, BGEVENT_READ, VioletGymSign + bg_event 24, 8, BGEVENT_READ, SproutTowerSign + bg_event 27, 17, BGEVENT_READ, EarlsPokemonAcademySign + bg_event 32, 25, BGEVENT_READ, VioletCityPokecenterSign + bg_event 10, 17, BGEVENT_READ, VioletCityMartSign + bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion .ObjectEvents: db 8 - object_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL - object_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 - object_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 - object_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - object_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 - object_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 - object_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP - object_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY + object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL + object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1 + object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 + object_event 17, 20, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 + object_event 5, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + object_event 14, 29, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 + object_event 4, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP + object_event 35, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY |