diff options
Diffstat (limited to 'maps/KrissHouse1F.asm')
| -rw-r--r-- | maps/KrissHouse1F.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 20d5d0b7e..24092cc4f 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -391,26 +391,26 @@ KrissHouse1F_MapEventHeader: .Warps: db 3 - warp_def $7, $6, 2, NEW_BARK_TOWN - warp_def $7, $7, 2, NEW_BARK_TOWN - warp_def $0, $9, 1, KRISS_HOUSE_2F + warp_def 6, 7, 2, NEW_BARK_TOWN + warp_def 7, 7, 2, NEW_BARK_TOWN + warp_def 9, 0, 1, KRISS_HOUSE_2F .CoordEvents: db 2 - coord_event 0, $4, $8, UnknownScript_0x7a4d8 - coord_event 0, $4, $9, UnknownScript_0x7a4db + coord_event 8, 4, 0, UnknownScript_0x7a4d8 + coord_event 9, 4, 0, UnknownScript_0x7a4db .BGEvents: db 4 - bg_event 1, 0, BGEVENT_READ, StoveScript + bg_event 0, 1, BGEVENT_READ, StoveScript bg_event 1, 1, BGEVENT_READ, SinkScript - bg_event 1, 2, BGEVENT_READ, FridgeScript - bg_event 1, 4, BGEVENT_READ, TVScript + bg_event 2, 1, BGEVENT_READ, FridgeScript + bg_event 4, 1, BGEVENT_READ, TVScript .ObjectEvents: db 5 - object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 - object_event SPRITE_MOM, 2, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event SPRITE_MOM, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event SPRITE_MOM, 2, 0, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 - object_event SPRITE_POKEFAN_F, 4, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 + object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + object_event 4, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR |