aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonprizeroom.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/celadonprizeroom.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/celadonprizeroom.asm')
-rwxr-xr-xdata/mapObjects/celadonprizeroom.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm
index c440bad5..bdaafe02 100755
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/celadonprizeroom.asm
@@ -1,19 +1,19 @@
CeladonPrizeRoomObject:
db $f ; border block
- db $2 ; warps
- db $7, $4, $9, $ff
- db $7, $5, $9, $ff
+ db 2 ; warps
+ warp 4, 7, 9, -1
+ warp 5, 7, 9, -1
- db $3 ; signs
- db $2, $2, $3 ; CeladonPrizeRoomText3
- db $2, $4, $4 ; CeladonPrizeRoomText4
- db $2, $6, $5 ; CeladonPrizeRoomText5
+ db 3 ; signs
+ sign 2, 2, 3 ; CeladonPrizeRoomText3
+ sign 4, 2, 4 ; CeladonPrizeRoomText4
+ sign 6, 2, 5 ; CeladonPrizeRoomText5
- db $2 ; objects
- object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person
- object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person
+ db 2 ; objects
+ object SPRITE_BALDING_GUY, 1, 4, STAY, NONE, 1 ; person
+ object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person
; warp-to
- EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4
- EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5
+ warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH
+ warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH