summaryrefslogtreecommitdiff
path: root/data/mapObjects/celadongamecorner.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/celadongamecorner.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/celadongamecorner.asm')
-rwxr-xr-xdata/mapObjects/celadongamecorner.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm
index 46b1c906..f1b91d56 100755
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/celadongamecorner.asm
@@ -2,12 +2,12 @@ CeladonGameCornerObject:
db $f ; border block
db $3 ; warps
- db $11, $f, $7, $ff
- db $11, $10, $7, $ff
- db $4, $11, $1, ROCKET_HIDEOUT_1
+ warp $f, $11, $7, $ff
+ warp $10, $11, $7, $ff
+ warp $11, $4, $1, ROCKET_HIDEOUT_1
db $1 ; signs
- db $4, $9, $c ; CeladonGameCornerText12
+ sign $9, $4, $c ; CeladonGameCornerText12
db $b ; objects
object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person
@@ -23,6 +23,6 @@ CeladonGameCornerObject:
object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7
; warp-to
- EVENT_DISP GAME_CORNER_WIDTH, $11, $f
- EVENT_DISP GAME_CORNER_WIDTH, $11, $10
- EVENT_DISP GAME_CORNER_WIDTH, $4, $11 ; ROCKET_HIDEOUT_1
+ warp_to $f, $11, GAME_CORNER_WIDTH
+ warp_to $10, $11, GAME_CORNER_WIDTH
+ warp_to $11, $4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1