diff options
Diffstat (limited to 'maps/PlayersHouse1F.asm')
| -rw-r--r-- | maps/PlayersHouse1F.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index 61c52d7c9..ad4f5c39d 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -387,23 +387,23 @@ PlayersHouse1F_MapEvents: db 0, 0 ; filler db 3 ; warp events - warp_event 6, 7, NEW_BARK_TOWN, 2 - warp_event 7, 7, NEW_BARK_TOWN, 2 - warp_event 9, 0, PLAYERS_HOUSE_2F, 1 + warp_event 6, 7, NEW_BARK_TOWN, 2 + warp_event 7, 7, NEW_BARK_TOWN, 2 + warp_event 9, 0, PLAYERS_HOUSE_2F, 1 db 2 ; coord events - coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8 - coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db + coord_event 8, 4, SCENE_DEFAULT, UnknownScript_0x7a4d8 + coord_event 9, 4, SCENE_DEFAULT, UnknownScript_0x7a4db db 4 ; bg events - bg_event 0, 1, BGEVENT_READ, StoveScript - bg_event 1, 1, BGEVENT_READ, SinkScript - bg_event 2, 1, BGEVENT_READ, FridgeScript - bg_event 4, 1, BGEVENT_READ, TVScript + bg_event 0, 1, BGEVENT_READ, StoveScript + bg_event 1, 1, BGEVENT_READ, SinkScript + bg_event 2, 1, BGEVENT_READ, FridgeScript + bg_event 4, 1, BGEVENT_READ, TVScript db 5 ; object events - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 - object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 - object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 - object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_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_PLAYERS_HOUSE_1F_NEIGHBOR + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_1 + object_event 2, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, MORN, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 7, 4, SPRITE_MOM, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_HOUSE_MOM_2 + object_event 0, 2, SPRITE_MOM, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, NITE, 0, OBJECTTYPE_SCRIPT, 0, MomScript_0x7a582, EVENT_PLAYERS_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_PLAYERS_HOUSE_1F_NEIGHBOR |