aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadonmartroof.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/celadonmartroof.asm
parentAdd pokegold and pokefirered. (diff)
downloadpokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.gz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.tar.xz
pokeyellow-d271d6917549074e721f3e5064b77e1ad1dbe44a.zip
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/celadonmartroof.asm')
-rwxr-xr-xdata/mapObjects/celadonmartroof.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm
index 63a1b4d7..e6fda0e7 100755
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/celadonmartroof.asm
@@ -2,17 +2,17 @@ CeladonMartRoofObject:
db $42 ; border block
db $1 ; warps
- db $2, $f, $0, CELADON_MART_5
+ warp $f, $2, $0, CELADON_MART_5
db $4 ; signs
- db $1, $a, $3 ; CeladonMartRoofText3
- db $1, $b, $4 ; CeladonMartRoofText4
- db $2, $c, $5 ; CeladonMartRoofText5
- db $2, $d, $6 ; CeladonMartRoofText6
+ sign $a, $1, $3 ; CeladonMartRoofText3
+ sign $b, $1, $4 ; CeladonMartRoofText4
+ sign $c, $2, $5 ; CeladonMartRoofText5
+ sign $d, $2, $6 ; CeladonMartRoofText6
db $2 ; objects
object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person
object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person
; warp-to
- EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5
+ warp_to $f, $2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5