diff options
Diffstat (limited to 'maps/VioletCity.asm')
| -rw-r--r-- | maps/VioletCity.asm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 87ec32077..2d503853b 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -14,8 +14,6 @@ VioletCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -84,7 +82,7 @@ SproutTowerSign: EarlsPokemonAcademySign: jumptext EarlsPokemonAcademySignText -VioletCityPokeCenterSign: +VioletCityPokecenterSign: jumpstd pokecentersign VioletCityMartSign: @@ -305,17 +303,17 @@ VioletCity_MapEventHeader: signpost 17, 15, SIGNPOST_READ, VioletGymSign signpost 8, 24, SIGNPOST_READ, SproutTowerSign signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign - signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign + signpost 25, 32, SIGNPOST_READ, VioletCityPokecenterSign signpost 17, 10, SIGNPOST_READ, VioletCityMartSign signpost 14, 37, SIGNPOST_ITEM, VioletCityHiddenHyperPotion .PersonEvents: db 8 - person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL - person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 - person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 + person_event SPRITE_FISHER, 16, 13, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL + person_event SPRITE_LASS, 28, 28, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityLassScript, -1 + person_event SPRITE_SUPER_NERD, 14, 24, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1 person_event SPRITE_GRAMPS, 20, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityGrampsScript, -1 - person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 + person_event SPRITE_YOUNGSTER, 18, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, VioletCityYoungsterScript, -1 person_event SPRITE_FRUIT_TREE, 29, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletCityFruitTreeScript, -1 person_event SPRITE_POKE_BALL, 1, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityPPUp, EVENT_VIOLET_CITY_PP_UP person_event SPRITE_POKE_BALL, 5, 35, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, VioletCityRareCandy, EVENT_VIOLET_CITY_RARE_CANDY |