aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/fuchsiameetingroom.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/fuchsiameetingroom.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/fuchsiameetingroom.asm')
-rwxr-xr-xdata/mapObjects/fuchsiameetingroom.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm
index 8106b9ec..c6c10415 100755
--- a/data/mapObjects/fuchsiameetingroom.asm
+++ b/data/mapObjects/fuchsiameetingroom.asm
@@ -1,17 +1,17 @@
FuchsiaMeetingRoomObject:
db $17 ; border block
- db $2 ; warps
- db $7, $4, $6, $ff
- db $7, $5, $6, $ff
+ db 2 ; warps
+ warp 4, 7, 6, -1
+ warp 5, 7, 6, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_WHITE_PLAYER, $4, $1, STAY, DOWN, $1 ; person
- object SPRITE_WHITE_PLAYER, $0, $2, STAY, UP, $2 ; person
- object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person
+ db 3 ; objects
+ object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person
+ object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person
+ object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person
; warp-to
- EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4
- EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5
+ warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH
+ warp_to 5, 7, FUCHSIA_MEETING_ROOM_WIDTH