summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadonprizeroom.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/celadonprizeroom.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/celadonprizeroom.asm')
-rwxr-xr-xdata/mapObjects/celadonprizeroom.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm
index c440bad5..8acea80c 100755
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/celadonprizeroom.asm
@@ -2,18 +2,18 @@ CeladonPrizeRoomObject:
db $f ; border block
db $2 ; warps
- db $7, $4, $9, $ff
- db $7, $5, $9, $ff
+ warp $4, $7, $9, $ff
+ warp $5, $7, $9, $ff
db $3 ; signs
- db $2, $2, $3 ; CeladonPrizeRoomText3
- db $2, $4, $4 ; CeladonPrizeRoomText4
- db $2, $6, $5 ; CeladonPrizeRoomText5
+ 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
; 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