aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/MrFujisHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/MrFujisHouse.asm')
-rwxr-xr-xdata/maps/objects/MrFujisHouse.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm
index 289d3a81..fa229664 100755
--- a/data/maps/objects/MrFujisHouse.asm
+++ b/data/maps/objects/MrFujisHouse.asm
@@ -1,13 +1,13 @@
MrFujisHouse_Object:
db $a ; border block
- db 2 ; warps
+ def_warps
warp 2, 7, 2, LAST_MAP
warp 3, 7, 2, LAST_MAP
- db 0 ; signs
+ def_signs
- db 6 ; objects
+ def_objects
object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person
object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person
object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person
@@ -15,6 +15,4 @@ MrFujisHouse_Object:
object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person
object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person
- ; warp-to
- warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
- warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH
+ def_warps_to MR_FUJIS_HOUSE