diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 10:57:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 10:57:14 -0600 |
| commit | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch) | |
| tree | 3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/pewtercity.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
| parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff) | |
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/pewtercity.asm')
| -rwxr-xr-x | data/mapObjects/pewtercity.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index 7b389bd2..4e7d24d0 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -1,36 +1,36 @@ PewterCityObject: db $a ; border block - db $7 ; warps - db $7, $e, $0, MUSEUM_1F - db $5, $13, $2, MUSEUM_1F - db $11, $10, $0, PEWTER_GYM - db $d, $1d, $0, PEWTER_HOUSE_1 - db $11, $17, $0, PEWTER_MART - db $1d, $7, $0, PEWTER_HOUSE_2 - db $19, $d, $0, PEWTER_POKECENTER + db 7 ; warps + warp 14, 7, 0, MUSEUM_1F + warp 19, 5, 2, MUSEUM_1F + warp 16, 17, 0, PEWTER_GYM + warp 29, 13, 0, PEWTER_HOUSE_1 + warp 23, 17, 0, PEWTER_MART + warp 7, 29, 0, PEWTER_HOUSE_2 + warp 13, 25, 0, PEWTER_POKECENTER - db $7 ; signs - db $1d, $13, $6 ; PewterCityText6 - db $13, $21, $7 ; PewterCityText7 - db $11, $18, $8 ; MartSignText - db $19, $e, $9 ; PokeCenterSignText - db $9, $f, $a ; PewterCityText10 - db $11, $b, $b ; PewterCityText11 - db $17, $19, $c ; PewterCityText12 + db 7 ; signs + sign 19, 29, 6 ; PewterCityText6 + sign 33, 19, 7 ; PewterCityText7 + sign 24, 17, 8 ; MartSignText + sign 14, 25, 9 ; PokeCenterSignText + sign 15, 9, 10 ; PewterCityText10 + sign 11, 17, 11 ; PewterCityText11 + sign 25, 23, 12 ; PewterCityText12 - db $5 ; objects - object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $11, $19, STAY, NONE, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, STAY, NONE, $3 ; person - object SPRITE_BLACK_HAIR_BOY_2, $1a, $19, WALK, $2, $4 ; person - object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person + object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person + object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person + object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person + object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person ; warp-to - EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F - EVENT_DISP PEWTER_CITY_WIDTH, $5, $13 ; MUSEUM_1F - EVENT_DISP PEWTER_CITY_WIDTH, $11, $10 ; PEWTER_GYM - EVENT_DISP PEWTER_CITY_WIDTH, $d, $1d ; PEWTER_HOUSE_1 - EVENT_DISP PEWTER_CITY_WIDTH, $11, $17 ; PEWTER_MART - EVENT_DISP PEWTER_CITY_WIDTH, $1d, $7 ; PEWTER_HOUSE_2 - EVENT_DISP PEWTER_CITY_WIDTH, $19, $d ; PEWTER_POKECENTER + warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F + warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM + warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1 + warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART + warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2 + warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER |