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/indigoplateaulobby.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/indigoplateaulobby.asm')
| -rwxr-xr-x | data/mapObjects/indigoplateaulobby.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index dbeaa85b..bb5895ac 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -1,22 +1,22 @@ IndigoPlateauLobbyObject: db $0 ; border block - db $3 ; warps - db $b, $7, $0, $ff - db $b, $8, $1, $ff - db $0, $8, $0, LORELEIS_ROOM + db 3 ; warps + warp 7, 11, 0, -1 + warp 8, 11, 1, -1 + warp 8, 0, 0, LORELEIS_ROOM - db $0 ; signs + db 0 ; signs - db $6 ; objects - object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person - object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person - object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person - object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person - object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person - object SPRITE_CHANSEY, $8, $5, STAY, DOWN, $6 ; person + db 6 ; objects + object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person + object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person + object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person + object SPRITE_CHANSEY, 8, 5, STAY, DOWN, 6 ; person ; warp-to - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $8 - EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $0, $8 ; LORELEIS_ROOM + warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to 8, 11, INDIGO_PLATEAU_LOBBY_WIDTH + warp_to 8, 0, INDIGO_PLATEAU_LOBBY_WIDTH ; LORELEIS_ROOM |