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/unknowndungeon1.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data/mapObjects/unknowndungeon1.asm') diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 5348dab8..5d48af3b 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -1,20 +1,20 @@ UnknownDungeon1Object: db $7d ; border block - db $9 ; warps - db $11, $18, $6, $ff - db $11, $19, $6, $ff - db $1, $1b, $0, UNKNOWN_DUNGEON_2 - db $7, $17, $1, UNKNOWN_DUNGEON_2 - db $9, $12, $2, UNKNOWN_DUNGEON_2 - db $1, $7, $3, UNKNOWN_DUNGEON_2 - db $3, $1, $4, UNKNOWN_DUNGEON_2 - db $b, $3, $5, UNKNOWN_DUNGEON_2 - db $6, $0, $0, UNKNOWN_DUNGEON_3 + db 9 ; warps + warp 24, 17, 6, -1 + warp 25, 17, 6, -1 + warp 27, 1, 0, UNKNOWN_DUNGEON_2 + warp 23, 7, 1, UNKNOWN_DUNGEON_2 + warp 18, 9, 2, UNKNOWN_DUNGEON_2 + warp 7, 1, 3, UNKNOWN_DUNGEON_2 + warp 1, 3, 4, UNKNOWN_DUNGEON_2 + warp 3, 11, 5, UNKNOWN_DUNGEON_2 + warp 0, 6, 0, UNKNOWN_DUNGEON_3 - db $0 ; signs + db 0 ; signs - db $4 ; objects + db 4 ; objects object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE -- cgit v1.3.1-sl0p From dc503346cab810ad976c3943ad1acca13c69693d Mon Sep 17 00:00:00 2001 From: Shakib2001 Date: Fri, 27 Mar 2020 15:01:14 -0400 Subject: Removed EVENT_DISP --- data/mapObjects/unknowndungeon1.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/mapObjects/unknowndungeon1.asm') diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 5d48af3b..1287f752 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -21,12 +21,12 @@ UnknownDungeon1Object: object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $19 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $1b ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $7, $17 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $9, $12 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $7 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_2 - EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $6, $0 ; UNKNOWN_DUNGEON_3 + warp_to 24, 17, UNKNOWN_DUNGEON_1_WIDTH + warp_to 25, 17, UNKNOWN_DUNGEON_1_WIDTH + warp_to 27, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 23, 7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 18, 9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 7, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 1, 3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 3, 11, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2 + warp_to 0, 6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3 -- cgit v1.3.1-sl0p