aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Museum1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/Museum1F.asm')
-rwxr-xr-xdata/maps/objects/Museum1F.asm13
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm
index bc9ef031..9c31b4fb 100755
--- a/data/maps/objects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
@@ -1,25 +1,20 @@
Museum1F_Object:
db $a ; border block
- db 5 ; warps
+ def_warps
warp 10, 7, 0, LAST_MAP
warp 11, 7, 0, LAST_MAP
warp 16, 7, 1, LAST_MAP
warp 17, 7, 1, LAST_MAP
warp 7, 7, 0, MUSEUM_2F
- db 0 ; signs
+ def_signs
- db 5 ; objects
+ def_objects
object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person
object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person
object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person
object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
- ; warp-to
- 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
+ def_warps_to MUSEUM_1F