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/viridianmart.asm | |
| parent | d271d6917549074e721f3e5064b77e1ad1dbe44a (diff) | |
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/viridianmart.asm')
| -rwxr-xr-x | data/mapObjects/viridianmart.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index fc47718f..184ff892 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -1,17 +1,17 @@ ViridianMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $1, $ff - warp $4, $7, $1, $ff + db 2 ; warps + warp 3, 7, 1, -1 + warp 4, 7, 1, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_BUG_CATCHER, $5, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $3, $3, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person + object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person ; warp-to - warp_to $3, $7, VIRIDIAN_MART_WIDTH - warp_to $4, $7, VIRIDIAN_MART_WIDTH + warp_to 3, 7, VIRIDIAN_MART_WIDTH + warp_to 4, 7, VIRIDIAN_MART_WIDTH |