diff options
Diffstat (limited to 'data/mapObjects/cinnabarmart.asm')
| -rwxr-xr-x | data/mapObjects/cinnabarmart.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 5297930e..2c740a05 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -1,17 +1,17 @@ CinnabarMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $4, $ff + db 2 ; warps + warp 3, 7, 4, -1 + warp 4, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person - object SPRITE_ERIKA, $6, $2, STAY, NONE, $2 ; person - object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person + db 3 ; objects + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person + object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person ; warp-to - warp_to $3, $7, CINNABAR_MART_WIDTH - warp_to $4, $7, CINNABAR_MART_WIDTH + warp_to 3, 7, CINNABAR_MART_WIDTH + warp_to 4, 7, CINNABAR_MART_WIDTH |