From 3d8e949d373a828fee370b08d005f131abb67333 Mon Sep 17 00:00:00 2001 From: Shakib2001 Date: Fri, 27 Mar 2020 14:31:38 -0400 Subject: Added warp, warp_to and sign compatibility --- data/mapObjects/route18.asm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data/mapObjects/route18.asm') diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 41b971b0..9c12faf6 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -1,23 +1,23 @@ Route18Object: db $43 ; border block - db $4 ; warps - db $8, $21, $0, ROUTE_18_GATE_1F - db $9, $21, $0, ROUTE_18_GATE_1F - db $8, $28, $2, ROUTE_18_GATE_1F - db $9, $28, $2, ROUTE_18_GATE_1F + db 4 ; warps + warp 33, 8, 0, ROUTE_18_GATE_1F + warp 33, 9, 0, ROUTE_18_GATE_1F + warp 40, 8, 2, ROUTE_18_GATE_1F + warp 40, 9, 2, ROUTE_18_GATE_1F - db $2 ; signs - db $7, $2b, $4 ; Route18Text4 - db $5, $21, $5 ; Route18Text5 + db 2 ; signs + sign 43, 7, 4 ; Route18Text4 + sign 33, 5, 5 ; Route18Text5 - db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8 - object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, OPP_BIRD_KEEPER, $9 - object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 + object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 + object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 ; warp-to - EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $9, $21 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $8, $28 ; ROUTE_18_GATE_1F - EVENT_DISP ROUTE_18_WIDTH, $9, $28 ; ROUTE_18_GATE_1F + warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 33, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 40, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F + warp_to 40, 9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F -- cgit v1.3.1-sl0p