summaryrefslogtreecommitdiff
path: root/data/mapObjects/fuchsiamart.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 11:12:59 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 11:12:59 -0500
commitdd4f0a0064921f74fd68750848fca87ae21c4545 (patch)
tree9b5aea440c39119121720a850a467bb5837c84da /data/mapObjects/fuchsiamart.asm
parentd271d6917549074e721f3e5064b77e1ad1dbe44a (diff)
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/fuchsiamart.asm')
-rwxr-xr-xdata/mapObjects/fuchsiamart.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm
index 7b837824..ab06366d 100755
--- a/data/mapObjects/fuchsiamart.asm
+++ b/data/mapObjects/fuchsiamart.asm
@@ -1,17 +1,17 @@
FuchsiaMartObject:
- db $0 ; border block
+ db 0 ; border block
- db $2 ; warps
- warp $3, $7, $0, $ff
- warp $4, $7, $0, $ff
+ db 2 ; warps
+ warp 3, 7, 0, -1
+ warp 4, 7, 0, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
- object SPRITE_FAT_BALD_GUY, $4, $2, STAY, NONE, $2 ; person
- object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person
; warp-to
- warp_to $3, $7, FUCHSIA_MART_WIDTH
- warp_to $4, $7, FUCHSIA_MART_WIDTH
+ warp_to 3, 7, FUCHSIA_MART_WIDTH
+ warp_to 4, 7, FUCHSIA_MART_WIDTH