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/vermiliondock.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/vermiliondock.asm')
| -rwxr-xr-x | data/mapObjects/vermiliondock.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 54d6790a..289689b5 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -1,14 +1,14 @@ VermilionDockObject: db $f ; border block - db $2 ; warps - db $0, $e, $5, $ff - db $2, $e, $1, SS_ANNE_1 + db 2 ; warps + warp 14, 0, 5, -1 + warp 14, 2, 1, SS_ANNE_1 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e - EVENT_DISP VERMILION_DOCK_WIDTH, $2, $e ; SS_ANNE_1 + warp_to 14, 0, VERMILION_DOCK_WIDTH + warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1 |