summaryrefslogtreecommitdiff
path: root/data/mapObjects/museum1f.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/museum1f.asm')
-rwxr-xr-xdata/mapObjects/museum1f.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm
index d05ff623..557eaf63 100755
--- a/data/mapObjects/museum1f.asm
+++ b/data/mapObjects/museum1f.asm
@@ -1,25 +1,25 @@
Museum1FObject:
- db $a ; border block
+ db 10 ; border block
- db $5 ; warps
- warp $a, $7, $0, $ff
- warp $b, $7, $0, $ff
- warp $10, $7, $1, $ff
- warp $11, $7, $1, $ff
- warp $7, $7, $0, MUSEUM_2F
+ db 5 ; warps
+ warp 10, 7, 0, -1
+ warp 11, 7, 0, -1
+ warp 16, 7, 1, -1
+ warp 17, 7, 1, -1
+ warp 7, 7, 0, MUSEUM_2F
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_OAK_AIDE, $c, $4, STAY, LEFT, $1 ; person
- object SPRITE_GAMBLER, $1, $4, STAY, NONE, $2 ; person
- object SPRITE_OAK_AIDE, $f, $2, STAY, DOWN, $3 ; person
- object SPRITE_OAK_AIDE, $11, $4, STAY, NONE, $4 ; person
- object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person
+ db 5 ; objects
+ object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person
+ object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
+ object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person
+ object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person
+ object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
; warp-to
- warp_to $a, $7, MUSEUM_1F_WIDTH
- warp_to $b, $7, MUSEUM_1F_WIDTH
- warp_to $10, $7, MUSEUM_1F_WIDTH
- warp_to $11, $7, MUSEUM_1F_WIDTH
- warp_to $7, $7, MUSEUM_1F_WIDTH ; MUSEUM_2F
+ warp_to 10, 7, MUSEUM_1F_WIDTH
+ warp_to 11, 7, MUSEUM_1F_WIDTH
+ warp_to 16, 7, MUSEUM_1F_WIDTH
+ warp_to 17, 7, MUSEUM_1F_WIDTH
+ warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F