diff options
Diffstat (limited to 'data/mapObjects/mansion1.asm')
| -rwxr-xr-x | data/mapObjects/mansion1.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index ae2c88ca..6e639865 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -1,29 +1,29 @@ Mansion1Object: - db $2e ; border block + db 46 ; border block - db $8 ; warps - warp $4, $1b, $0, $ff - warp $5, $1b, $0, $ff - warp $6, $1b, $0, $ff - warp $7, $1b, $0, $ff - warp $5, $a, $0, MANSION_2 - warp $15, $17, $0, MANSION_4 - warp $1a, $1b, $0, $ff - warp $1b, $1b, $0, $ff + db 8 ; warps + warp 4, 27, 0, -1 + warp 5, 27, 0, -1 + warp 6, 27, 0, -1 + warp 7, 27, 0, -1 + warp 5, 10, 0, MANSION_2 + warp 21, 23, 0, MANSION_4 + warp 26, 27, 0, -1 + warp 27, 27, 0, -1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, OPP_SCIENTIST, $4 - object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE - object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS + db 3 ; objects + object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS ; warp-to - warp_to $4, $1b, MANSION_1_WIDTH - warp_to $5, $1b, MANSION_1_WIDTH - warp_to $6, $1b, MANSION_1_WIDTH - warp_to $7, $1b, MANSION_1_WIDTH - warp_to $5, $a, MANSION_1_WIDTH ; MANSION_2 - warp_to $15, $17, MANSION_1_WIDTH ; MANSION_4 - warp_to $1a, $1b, MANSION_1_WIDTH - warp_to $1b, $1b, MANSION_1_WIDTH + warp_to 4, 27, MANSION_1_WIDTH + warp_to 5, 27, MANSION_1_WIDTH + warp_to 6, 27, MANSION_1_WIDTH + warp_to 7, 27, MANSION_1_WIDTH + warp_to 5, 10, MANSION_1_WIDTH ; MANSION_2 + warp_to 21, 23, MANSION_1_WIDTH ; MANSION_4 + warp_to 26, 27, MANSION_1_WIDTH + warp_to 27, 27, MANSION_1_WIDTH |