diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 10:48:36 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 10:48:36 -0400 |
| commit | d9d9354e11afbde77ae510920c498d4143f37013 (patch) | |
| tree | 670076c9cdfb5dd925bf29d5b55a9097989c11d4 /data | |
| parent | 7229ccb81b8a53683d0158477fc3b8916416c35f (diff) | |
Include Saffron City
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/saffroncity.asm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 69e76ee7..5980659b 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCityObject: ; 0x509dc (size=188) +SaffronCityObject: ; 0x509e2 (size=188) db $f ; border block db $8 ; warps @@ -23,7 +23,7 @@ SaffronCityObject: ; 0x509dc (size=188) db $1d, $1b, $18 ; SaffronCityText24 db $13, $1, $19 ; SaffronCityText25 - db $f ; objects + db $e ; objects object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person @@ -38,7 +38,6 @@ SaffronCityObject: ; 0x509dc (size=188) object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person - object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F |