summaryrefslogtreecommitdiff
path: root/data/mapObjects/museum2f.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/museum2f.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/museum2f.asm')
-rwxr-xr-xdata/mapObjects/museum2f.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm
index 689391d9..e93a6837 100755
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/museum2f.asm
@@ -2,11 +2,11 @@ Museum2FObject:
db $a ; border block
db $1 ; warps
- db $7, $7, $4, MUSEUM_1F
+ warp $7, $7, $4, MUSEUM_1F
db $2 ; signs
- db $2, $b, $6 ; Museum2FText6
- db $5, $2, $7 ; Museum2FText7
+ sign $b, $2, $6 ; Museum2FText6
+ sign $2, $5, $7 ; Museum2FText7
db $5 ; objects
object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person
@@ -16,4 +16,4 @@ Museum2FObject:
object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person
; warp-to
- EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F
+ warp_to $7, $7, MUSEUM_2F_WIDTH ; MUSEUM_1F