summaryrefslogtreecommitdiff
path: root/data/mapObjects/bikeshop.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/bikeshop.asm')
-rwxr-xr-xdata/mapObjects/bikeshop.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm
index 5a7e832c..98208a94 100755
--- a/data/mapObjects/bikeshop.asm
+++ b/data/mapObjects/bikeshop.asm
@@ -1,17 +1,17 @@
BikeShopObject:
db $e ; border block
- db $2 ; warps
- db $7, $2, $4, $ff
- db $7, $3, $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
- EVENT_DISP BIKE_SHOP_WIDTH, $7, $2
- EVENT_DISP BIKE_SHOP_WIDTH, $7, $3
+ warp_to 2, 7, BIKE_SHOP_WIDTH
+ warp_to 3, 7, BIKE_SHOP_WIDTH