summaryrefslogtreecommitdiff
path: root/data/mapObjects/lab2.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/lab2.asm
parentd271d6917549074e721f3e5064b77e1ad1dbe44a (diff)
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/lab2.asm')
-rwxr-xr-xdata/mapObjects/lab2.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm
index 77d1eef6..81fdbc8a 100755
--- a/data/mapObjects/lab2.asm
+++ b/data/mapObjects/lab2.asm
@@ -1,17 +1,17 @@
Lab2Object:
- db $17 ; border block
+ db 23 ; border block
- db $2 ; warps
- warp $2, $7, $2, CINNABAR_LAB_1
- warp $3, $7, $2, CINNABAR_LAB_1
+ db 2 ; warps
+ warp 2, 7, 2, CINNABAR_LAB_1
+ warp 3, 7, 2, CINNABAR_LAB_1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, DOWN, $1 ; person
- object SPRITE_OLD_PERSON, $1, $4, STAY, NONE, $2 ; person
- object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person
+ db 3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person
+ object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
; warp-to
- warp_to $2, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
- warp_to $3, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
+ warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
+ warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1