diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-03-27 14:11:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 14:11:59 -0500 |
| commit | e2e8bf6a8477af254ea7057028f72ac918b62005 (patch) | |
| tree | ffed0137cf81880afa4b0ec2fa30300565996f4b /data/mapObjects/oakslab.asm | |
| parent | ab7c9634be9c7d26c66ebd69b2fcfe3994d627be (diff) | |
| parent | dc503346cab810ad976c3943ad1acca13c69693d (diff) | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/oakslab.asm')
| -rwxr-xr-x | data/mapObjects/oakslab.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 1efb1e72..8595d81c 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -1,23 +1,23 @@ OaksLabObject: db $3 ; border block - db $2 ; warps - db $b, $4, $2, $ff - db $b, $5, $2, $ff + db 2 ; warps + warp 4, 11, 2, -1 + warp 5, 11, 2, -1 - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_BLUE, $4, $3, STAY, NONE, $1, OPP_SONY1, $1 - object SPRITE_BALL, $7, $3, STAY, NONE, $2 ; person - object SPRITE_OAK, $5, $2, STAY, DOWN, $3 ; person - object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $4 ; person - object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $5 ; person - object SPRITE_OAK, $5, $a, STAY, UP, $6 ; person - object SPRITE_GIRL, $1, $9, WALK, $1, $7 ; person - object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $8 ; person - object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $9 ; person + db 9 ; objects + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 + object SPRITE_BALL, 7, 3, STAY, NONE, 2 ; person + object SPRITE_OAK, 5, 2, STAY, DOWN, 3 ; person + object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 4 ; person + object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 5 ; person + object SPRITE_OAK, 5, 10, STAY, UP, 6 ; person + object SPRITE_GIRL, 1, 9, WALK, 1, 7 ; person + object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 8 ; person + object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 9 ; person ; warp-to - EVENT_DISP OAKS_LAB_WIDTH, $b, $4 - EVENT_DISP OAKS_LAB_WIDTH, $b, $5 + warp_to 4, 11, OAKS_LAB_WIDTH + warp_to 5, 11, OAKS_LAB_WIDTH |