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/lorelei.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/lorelei.asm')
| -rwxr-xr-x | data/mapObjects/lorelei.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 5b985369..e5f0f9f2 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -1,19 +1,19 @@ LoreleiObject: db $3 ; border block - db $4 ; warps - db $b, $4, $2, INDIGO_PLATEAU_LOBBY - db $b, $5, $2, INDIGO_PLATEAU_LOBBY - db $0, $4, $0, BRUNOS_ROOM - db $0, $5, $1, BRUNOS_ROOM + db 4 ; warps + warp 4, 11, 2, INDIGO_PLATEAU_LOBBY + warp 5, 11, 2, INDIGO_PLATEAU_LOBBY + warp 4, 0, 0, BRUNOS_ROOM + warp 5, 0, 1, BRUNOS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, OPP_LORELEI, $1 + db 1 ; objects + object SPRITE_LORELEI, 5, 2, STAY, DOWN, 1, OPP_LORELEI, 1 ; warp-to - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM - EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM + warp_to 4, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 5, 11, LORELEIS_ROOM_WIDTH ; INDIGO_PLATEAU_LOBBY + warp_to 4, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM + warp_to 5, 0, LORELEIS_ROOM_WIDTH ; BRUNOS_ROOM |