summaryrefslogtreecommitdiff
path: root/data/maps/objects/VermilionCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/VermilionCity.asm')
-rw-r--r--data/maps/objects/VermilionCity.asm17
1 files changed, 9 insertions, 8 deletions
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
index c30d43ba..e86720fe 100644
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -13,20 +13,21 @@ VermilionCity_Object:
warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 0
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
+ bg_event 27, 3, 8 ; VermilionCityText7
+ bg_event 37, 13, 9 ; VermilionCityText8
+ bg_event 24, 13, 10 ; MartSignText
+ bg_event 12, 3, 11 ; PokeCenterSignText
+ bg_event 7, 13, 12 ; VermilionCityText11
+ bg_event 7, 19, 13 ; VermilionCityText12
+ bg_event 29, 15, 14 ; VermilionCityText13
def_object_events
- object_event 19, 7, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
+ object_event 19, 7, SPRITE_COOLTRAINER_F, 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
+ object_event 19, 15, SPRITE_OFFICER_JENNY, STAY, NONE, 7 ; person
def_warps_to VERMILION_CITY