aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/indigoplateaulobby.asm
diff options
context:
space:
mode:
authorShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
committerShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
commit3d8e949d373a828fee370b08d005f131abb67333 (patch)
treee200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/indigoplateaulobby.asm
parentMerge branch 'master' of https://github.com/CelestialAmber/pokeyellow (diff)
downloadpokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.gz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.tar.xz
pokeyellow-3d8e949d373a828fee370b08d005f131abb67333.zip
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/indigoplateaulobby.asm')
-rwxr-xr-xdata/mapObjects/indigoplateaulobby.asm30
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