summaryrefslogtreecommitdiff
path: root/maps/KrissNeighborsHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/KrissNeighborsHouse.asm')
-rw-r--r--maps/KrissNeighborsHouse.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm
index 44dbd8449..0cd9f77dc 100644
--- a/maps/KrissNeighborsHouse.asm
+++ b/maps/KrissNeighborsHouse.asm
@@ -104,19 +104,19 @@ KrissNeighborsHouse_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 3, NEW_BARK_TOWN
- warp_def $7, $3, 3, NEW_BARK_TOWN
+ warp_def 2, 7, 3, NEW_BARK_TOWN
+ warp_def 3, 7, 3, NEW_BARK_TOWN
.CoordEvents:
db 0
.BGEvents:
db 3
- bg_event 1, 0, BGEVENT_READ, KrissNeighborsHouseBookshelf
+ bg_event 0, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
bg_event 1, 1, BGEVENT_READ, KrissNeighborsHouseBookshelf
- bg_event 1, 7, BGEVENT_READ, KrissNeighborsHouseRadio
+ bg_event 7, 1, BGEVENT_READ, KrissNeighborsHouseRadio
.ObjectEvents:
db 2
- object_event SPRITE_COOLTRAINER_F, 3, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
- object_event SPRITE_POKEFAN_F, 3, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
+ object_event 2, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighborsDaughter, -1
+ object_event 5, 3, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR