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/bikeshop.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/bikeshop.asm')
| -rwxr-xr-x | data/mapObjects/bikeshop.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index ce5fe9b8..e5ff250c 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -1,17 +1,17 @@ BikeShopObject: - db $e ; border block + db 14 ; border block - db $2 ; warps - warp $2, $7, $4, $ff - warp $3, $7, $4, $ff + db 2 ; warps + warp 2, 7, 4, -1 + warp 3, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BIKE_SHOP_GUY, $6, $2, STAY, NONE, $1 ; person - object SPRITE_MOM_GEISHA, $5, $6, WALK, $1, $2 ; person - object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person + db 3 ; objects + object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person + object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person + object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person ; warp-to - warp_to $2, $7, BIKE_SHOP_WIDTH - warp_to $3, $7, BIKE_SHOP_WIDTH + warp_to 2, 7, BIKE_SHOP_WIDTH + warp_to 3, 7, BIKE_SHOP_WIDTH |