summaryrefslogtreecommitdiff
path: root/maps/KrissHouse2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/KrissHouse2F.asm')
-rw-r--r--maps/KrissHouse2F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm
index 528dc505f..65d5fdaee 100644
--- a/maps/KrissHouse2F.asm
+++ b/maps/KrissHouse2F.asm
@@ -122,21 +122,21 @@ KrissHouse2F_MapEventHeader:
.Warps:
db 1
- warp_def $0, $7, 3, KRISS_HOUSE_1F
+ warp_def 7, 0, 3, KRISS_HOUSE_1F
.CoordEvents:
db 0
.BGEvents:
db 4
- bg_event 1, 2, BGEVENT_UP, KrissHousePC
- bg_event 1, 3, BGEVENT_READ, KrissHouseRadio
- bg_event 1, 5, BGEVENT_READ, KrissHouseBookshelf
- bg_event 0, 6, BGEVENT_IFSET, KrissHousePoster
+ bg_event 2, 1, BGEVENT_UP, KrissHousePC
+ bg_event 3, 1, BGEVENT_READ, KrissHouseRadio
+ bg_event 5, 1, BGEVENT_READ, KrissHouseBookshelf
+ bg_event 6, 0, BGEVENT_IFSET, KrissHousePoster
.ObjectEvents:
db 4
- object_event SPRITE_CONSOLE, 2, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
- object_event SPRITE_DOLL_1, 4, 4, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
- object_event SPRITE_DOLL_2, 4, 5, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
- object_event SPRITE_BIG_DOLL, 1, 0, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL
+ object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE
+ object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1
+ object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2
+ object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL