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/rocktunnelpokecenter.asm | |
| parent | Merge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff) | |
| parent | Removed EVENT_DISP (diff) | |
| download | pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.gz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.tar.xz pokeyellow-e2e8bf6a8477af254ea7057028f72ac918b62005.zip | |
Merge pull request #47 from ValientOrc98/master
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/rocktunnelpokecenter.asm')
| -rwxr-xr-x | data/mapObjects/rocktunnelpokecenter.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 06a2e39d..f2d429b7 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -1,19 +1,19 @@ RockTunnelPokecenterObject: db $0 ; border block - db $2 ; warps - db $7, $3, $0, $ff - db $7, $4, $0, $ff + db 2 ; warps + warp 3, 7, 0, -1 + warp 4, 7, 0, -1 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person - object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person - object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_GENTLEMAN, 7, 3, STAY, DOWN, 2 ; person + object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person + object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_CHANSEY, 4, 1, STAY, DOWN, 5 ; person ; warp-to - EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 - EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $4 + warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH + warp_to 4, 7, ROCK_TUNNEL_POKECENTER_WIDTH |