diff options
| author | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
|---|---|---|
| committer | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
| commit | 3d8e949d373a828fee370b08d005f131abb67333 (patch) | |
| tree | e200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/saffroncity.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| download | pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip | |
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/saffroncity.asm')
| -rwxr-xr-x | data/mapObjects/saffroncity.asm | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 730d8be5..6ff8ea93 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,50 +1,50 @@ SaffronCityObject: db $f ; border block - db $8 ; warps - db $5, $7, $0, COPYCATS_HOUSE_1F - db $3, $1a, $0, FIGHTING_DOJO - db $3, $22, $0, SAFFRON_GYM - db $b, $d, $0, SAFFRON_HOUSE_1 - db $b, $19, $0, SAFFRON_MART - db $15, $12, $0, SILPH_CO_1F - db $1d, $9, $0, SAFFRON_POKECENTER - db $1d, $1d, $0, SAFFRON_HOUSE_2 + db 8 ; warps + warp 7, 5, 0, COPYCATS_HOUSE_1F + warp 26, 3, 0, FIGHTING_DOJO + warp 34, 3, 0, SAFFRON_GYM + warp 13, 11, 0, SAFFRON_HOUSE_1 + warp 25, 11, 0, SAFFRON_MART + warp 18, 21, 0, SILPH_CO_1F + warp 9, 29, 0, SAFFRON_POKECENTER + warp 29, 29, 0, SAFFRON_HOUSE_2 - db $a ; signs - db $5, $11, $10 ; SaffronCityText16 - db $5, $1b, $11 ; SaffronCityText17 - db $5, $23, $12 ; SaffronCityText18 - db $b, $1a, $13 ; MartSignText - db $13, $27, $14 ; SaffronCityText20 - db $15, $5, $15 ; SaffronCityText21 - db $15, $f, $16 ; SaffronCityText22 - db $1d, $a, $17 ; PokeCenterSignText - db $1d, $1b, $18 ; SaffronCityText24 - db $13, $1, $19 ; SaffronCityText25 + db 10 ; signs + sign 17, 5, 16 ; SaffronCityText16 + sign 27, 5, 17 ; SaffronCityText17 + sign 35, 5, 18 ; SaffronCityText18 + sign 26, 11, 19 ; MartSignText + sign 39, 19, 20 ; SaffronCityText20 + sign 5, 21, 21 ; SaffronCityText21 + sign 15, 21, 22 ; SaffronCityText22 + sign 10, 29, 23 ; PokeCenterSignText + sign 27, 29, 24 ; SaffronCityText24 + sign 1, 19, 25 ; SaffronCityText25 - 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 - object SPRITE_ROCKET, $d, $c, STAY, NONE, $4 ; person - object SPRITE_ROCKET, $b, $19, WALK, $2, $5 ; person - object SPRITE_ROCKET, $20, $d, WALK, $2, $6 ; person - object SPRITE_ROCKET, $12, $1e, WALK, $2, $7 ; person - object SPRITE_OAK_AIDE, $8, $e, WALK, $0, $8 ; person - object SPRITE_LAPRAS_GIVER, $17, $17, STAY, NONE, $9 ; person - object SPRITE_ERIKA, $11, $1e, WALK, $2, $a ; person - object SPRITE_GENTLEMAN, $1e, $c, STAY, DOWN, $b ; person - 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 + db 14 ; objects + object SPRITE_ROCKET, 7, 6, STAY, NONE, 1 ; person + object SPRITE_ROCKET, 20, 8, WALK, 2, 2 ; person + object SPRITE_ROCKET, 34, 4, STAY, NONE, 3 ; person + object SPRITE_ROCKET, 13, 12, STAY, NONE, 4 ; person + object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person + object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person + object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person + object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person + object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person + object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person + object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person + object SPRITE_ROCKER, 18, 8, STAY, UP, 13 ; person + object SPRITE_ROCKET, 18, 22, STAY, DOWN, 14 ; person ; warp-to - EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $1a ; FIGHTING_DOJO - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $22 ; SAFFRON_GYM - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $d ; SAFFRON_HOUSE_1 - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $19 ; SAFFRON_MART - EVENT_DISP SAFFRON_CITY_WIDTH, $15, $12 ; SILPH_CO_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $9 ; SAFFRON_POKECENTER - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $1d ; SAFFRON_HOUSE_2 + warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F + warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO + warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM + warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE + warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART + warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F + warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER + warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE |