diff options
| -rw-r--r-- | maps/PlayersHouse2F.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 30e9ef51..c8c96cf3 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -78,19 +78,18 @@ PlayersHousePosterScript: .Script: describedecoration DECODESC_POSTER -Doll1Script: +PlayersHouseDoll1Script: describedecoration DECODESC_LEFT_DOLL -Doll2Script: +PlayersHouseDoll2Script: describedecoration DECODESC_RIGHT_DOLL -BigDollScript: +PlayersHouseBigDollScript: describedecoration DECODESC_BIG_DOLL -GameConsoleScript: +PlayersHouseGameConsoleScript: describedecoration DECODESC_CONSOLE - PlayersRadioText1: text "PROF.OAK'S #MON" line "TALK! Please tune" @@ -126,7 +125,7 @@ PlayersHouse2F_MapEvents: bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript def_object_events - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Doll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, EVENT_PLAYERS_HOUSE_2F_CONSOLE + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL |