diff options
| author | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
|---|---|---|
| committer | Shakib2001 <shakibafzali@gmail.com> | 2020-03-27 14:31:38 -0400 |
| commit | 3d8e949d373a828fee370b08d005f131abb67333 (patch) | |
| tree | e200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/unknowndungeon2.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| download | pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip | |
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/unknowndungeon2.asm')
| -rwxr-xr-x | data/mapObjects/unknowndungeon2.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index 8e696462..9d53c2bf 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -1,26 +1,26 @@ UnknownDungeon2Object: db $7d ; border block - db $6 ; warps - db $1, $1d, $2, UNKNOWN_DUNGEON_1 - db $6, $16, $3, UNKNOWN_DUNGEON_1 - db $7, $13, $4, UNKNOWN_DUNGEON_1 - db $1, $9, $5, UNKNOWN_DUNGEON_1 - db $3, $1, $6, UNKNOWN_DUNGEON_1 - db $b, $3, $7, UNKNOWN_DUNGEON_1 + db 6 ; warps + warp 29, 1, 2, UNKNOWN_DUNGEON_1 + warp 22, 6, 3, UNKNOWN_DUNGEON_1 + warp 19, 7, 4, UNKNOWN_DUNGEON_1 + warp 9, 1, 5, UNKNOWN_DUNGEON_1 + warp 1, 3, 6, UNKNOWN_DUNGEON_1 + warp 3, 11, 7, UNKNOWN_DUNGEON_1 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_BALL, $0, $b, STAY, NONE, $1, RARE_CANDY - object SPRITE_BALL, $10, $7, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $13, $b, STAY, NONE, $3, MAX_REVIVE - object SPRITE_BALL, $1b, $9, STAY, NONE, $4, FULL_RESTORE + db 4 ; objects + object SPRITE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY + object SPRITE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL + object SPRITE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE + object SPRITE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE ; warp-to - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $6, $16 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $7, $13 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $9 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_1 - EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_1 + warp_to 29, 1, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F + warp_to 22, 6, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F + warp_to 19, 7, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F + warp_to 9, 1, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F + warp_to 1, 3, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F + warp_to 3, 11, UNKNOWN_DUNGEON_2_WIDTH ; CERULEAN_CAVE_1F |