diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 11:51:19 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 11:51:19 -0400 |
| commit | 8abddd138c6aac54b3e1eb5c16d24fe6ce4b9c29 (patch) | |
| tree | 077c240e3404d4629ffc47892f81ec01902c7495 /data | |
| parent | c1b46c9bca3039140f052f75af9993ac8b67d64f (diff) | |
Include Cerulean City
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/ceruleancity.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 248a8e83..ff0f2c66 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -1,5 +1,5 @@ CeruleanCityObject: ; 0x18786 (size=170) - db $f ; border block + db $a ; border block db $a ; warps db $b, $1b, $0, TRASHED_HOUSE @@ -27,12 +27,12 @@ CeruleanCityObject: ; 0x18786 (size=170) object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person - object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person + object SPRITE_OFFICER_JENNY, $1c, $c, STAY, DOWN, $6 ; person object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person - object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person + object SPRITE_BALL, $1c, $1a, STAY, DOWN, $8 ; person object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person - object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person + object SPRITE_OFFICER_JENNY, $1b, $c, STAY, DOWN, $b ; person ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE |