summaryrefslogtreecommitdiff
path: root/data/mapObjects/museum2f.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/museum2f.asm')
-rwxr-xr-xdata/mapObjects/museum2f.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm
index 689391d9..11fad941 100755
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/museum2f.asm
@@ -1,19 +1,19 @@
Museum2FObject:
db $a ; border block
- db $1 ; warps
- db $7, $7, $4, MUSEUM_1F
+ db 1 ; warps
+ warp 7, 7, 4, MUSEUM_1F
- db $2 ; signs
- db $2, $b, $6 ; Museum2FText6
- db $5, $2, $7 ; Museum2FText7
+ db 2 ; signs
+ sign 11, 2, 6 ; Museum2FText6
+ sign 2, 5, 7 ; Museum2FText7
- db $5 ; objects
- object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person
- object SPRITE_OLD_PERSON, $0, $5, STAY, DOWN, $2 ; person
- object SPRITE_OAK_AIDE, $7, $5, STAY, DOWN, $3 ; person
- object SPRITE_BRUNETTE_GIRL, $b, $5, STAY, NONE, $4 ; person
- object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person
+ db 5 ; objects
+ object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person
+ object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person
+ object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person
+ object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
+ object SPRITE_HIKER, 12, 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