diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 11:12:59 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 11:12:59 -0500 |
| commit | dd4f0a0064921f74fd68750848fca87ae21c4545 (patch) | |
| tree | 9b5aea440c39119121720a850a467bb5837c84da /data/mapObjects/celadonmart2.asm | |
| parent | Add warp, sign, and warp_to macros for data/mapObjects definitions (diff) | |
| download | pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.gz pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.xz pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.zip | |
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/celadonmart2.asm')
| -rwxr-xr-x | data/mapObjects/celadonmart2.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 3b88d49f..ab69c91a 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -1,21 +1,21 @@ CeladonMart2Object: - db $f ; border block + db 15 ; border block - db $3 ; warps - warp $c, $1, $4, CELADON_MART_1 - warp $10, $1, $1, CELADON_MART_3 - warp $1, $1, $0, CELADON_MART_ELEVATOR + db 3 ; warps + warp 12, 1, 4, CELADON_MART_1 + warp 16, 1, 1, CELADON_MART_3 + warp 1, 1, 0, CELADON_MART_ELEVATOR - db $1 ; signs - sign $e, $1, $5 ; CeladonMart2Text5 + db 1 ; signs + sign 14, 1, 5 ; CeladonMart2Text5 - db $4 ; objects - object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person - object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person - object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person - object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person + db 4 ; objects + object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person + object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person ; warp-to - warp_to $c, $1, CELADON_MART_2_WIDTH ; CELADON_MART_1 - warp_to $10, $1, CELADON_MART_2_WIDTH ; CELADON_MART_3 - warp_to $1, $1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR + warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1 + warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3 + warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR |